From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 22 Sep 2015 16:37:24 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2:WP-Themes/mountpleasantwow into develop
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=6636ee5e0dc1ae88957188fc804ad04781027e59;p=WP-Themes%2Fglmthemes%2Fmountpleasant-theme.git

Merge branch 'develop' of cvs2:WP-Themes/mountpleasantwow into develop

Conflicts:
	css/app.css
	css/app.css.map
---

6636ee5e0dc1ae88957188fc804ad04781027e59
diff --cc css/app.css
index b0dd331,a2ab1a7..07683d9
--- a/css/app.css
+++ b/css/app.css
@@@ -7682,4 -7709,4 +7713,4 @@@ input.button 
        display: block; }
  
  /* End Mobile Menu */
--/*# sourceMappingURL=app.css.map */
++/*# sourceMappingURL=app.css.map */