projects / WP-Themes / glmthemes / shipwreck-theme.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab1874f 33743ef)
Merge branch 'hotfix/1.0.6'
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 21:15:40 +0000 (16:15 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 21:15:40 +0000 (16:15 -0500)

Trivial merge