projects / WP-Themes / gilmoremuseum.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c24793 7a24df7)
Merge branch 'develop' into hotfix/1.2.31
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 14:34:16 +0000 (09:34 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 14:34:16 +0000 (09:34 -0500)

Trivial merge