projects / WP-Themes / glmthemes / shipwreck-theme.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bae5b5 0a43b94)
Merge branch 'hotfix/1.0.11'
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 5 Jul 2016 15:47:56 +0000 (11:47 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 5 Jul 2016 15:47:56 +0000 (11:47 -0400)

Trivial merge