projects / WP-Themes / originalbutterflyhouse.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f612ad ddab840)
Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 21 Dec 2016 20:25:35 +0000 (15:25 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 21 Dec 2016 20:25:35 +0000 (15:25 -0500)

Trivial merge