projects / WP-Themes / gilmoremuseum.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37ceef2 b375e02)
Merge branch 'hotfix/1.1.96' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 16 Jun 2015 14:37:42 +0000 (10:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 16 Jun 2015 14:37:42 +0000 (10:37 -0400)

Trivial merge