projects / WP-Themes / gilmoremuseum.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 90b8e5e 389dc8d)
Merge branch 'hotfix/1.1.6' v1.1.6
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:36:02 +0000 (14:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:36:02 +0000 (14:36 -0400)

Trivial merge