projects / WP-Themes / glmthemes / countyfair-theme.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e11532e 9b6de93)
Merge branch 'hotfix/1.0.17'
authorIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 15:16:39 +0000 (11:16 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 15:16:39 +0000 (11:16 -0400)

Trivial merge