projects / WP-Themes / shipwreckmuseum.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30295c6 15b2cf5)
Merge branch 'hotfix/1.0.21' v1.0.21
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 23 May 2017 17:11:34 +0000 (13:11 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 23 May 2017 17:11:34 +0000 (13:11 -0400)

Trivial merge