projects / WP-Themes / shipwreckmuseum.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 410d26b 3718c27)
Merge branch 'hotfix/1.0.17' v1.0.17
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 18 May 2017 20:54:49 +0000 (16:54 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 18 May 2017 20:54:49 +0000 (16:54 -0400)

Trivial merge