projects / WP-Themes / shipwreckmuseum.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 775e073 44de537)
Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Tue, 23 Feb 2016 18:06:30 +0000 (13:06 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 23 Feb 2016 18:06:30 +0000 (13:06 -0500)

Trivial merge