projects / WP-Themes / shipwreckmuseum.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ff066d 06923ae)
Merge branch 'hotfix/1.0.20' v1.0.20
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 23 May 2017 17:07:17 +0000 (13:07 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 23 May 2017 17:07:17 +0000 (13:07 -0400)

Trivial merge