From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 28 Apr 2017 13:57:18 +0000 (-0400)
Subject: Merge branch 'release/1.0.6'
X-Git-Tag: v1.0.6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=0e4c8439ce174d54230d14a5b9aa4c0a7698b964;p=WP-Themes%2Fmackinawferry.git

Merge branch 'release/1.0.6'

Conflicts:
	css/app.css
---

0f92954726514144f1fe4d5c03617a4ac2eae527