projects / WP-Themes / mackinawferry.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4097607 98f53dd)
Merge branch 'release/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 28 Apr 2017 13:57:18 +0000 (09:57 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 28 Apr 2017 13:57:18 +0000 (09:57 -0400)
Conflicts:
css/app.css


Trivial merge