projects / WP-Themes / originalbutterflyhouse.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb8c2eb dadf451)
Merge branch 'hotfix/1.0.2' 1.0.2
authorIan Weller <ian@gaslightmedia.com>
Thu, 8 Dec 2016 16:06:23 +0000 (11:06 -0500)
committerIan Weller <ian@gaslightmedia.com>
Thu, 8 Dec 2016 16:06:23 +0000 (11:06 -0500)

Trivial merge