projects / WP-Themes / glmthemes / shipwreck-theme.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07b9f66 aa935cc)
Merge branch 'hotfix/1.0.12'
authorIan Weller <ian@gaslightmedia.com>
Tue, 5 Jul 2016 19:58:57 +0000 (15:58 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 5 Jul 2016 19:58:57 +0000 (15:58 -0400)

Trivial merge