projects / WP-Themes / gilmoremuseum.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2d3d65 22a592a)
Merge branch 'hotfix/1.2.5'
authorIan Weller <ian@gaslightmedia.com>
Mon, 5 Oct 2015 20:49:54 +0000 (16:49 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 5 Oct 2015 20:49:54 +0000 (16:49 -0400)

Trivial merge