projects / WP-Themes / originalbutterflyhouse.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc75151 b42fe31)
Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Dec 2016 14:15:49 +0000 (09:15 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Dec 2016 14:15:49 +0000 (09:15 -0500)

Trivial merge