projects / WP-Themes / gilmoremuseum.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c9c6e7 ca4e224)
Merge branch 'hotfix/1.2.15' v1.2.15
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 23 Nov 2015 20:25:13 +0000 (15:25 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 23 Nov 2015 20:25:13 +0000 (15:25 -0500)

Trivial merge