projects / WP-Themes / AdelaineConstruction.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d4e16b f9d199f)
Merge branch 'release/1.0.0'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Apr 2015 16:08:25 +0000 (12:08 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Apr 2015 16:08:25 +0000 (12:08 -0400)
Conflicts:
single.php


Trivial merge