Merge branch 'develop' of cvs2:WP-Themes/mountpleasantwow into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 22 Sep 2015 16:37:24 +0000 (12:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 22 Sep 2015 16:37:24 +0000 (12:37 -0400)
commit6636ee5e0dc1ae88957188fc804ad04781027e59
treedb62b320d97f6979d4afce9f025e7cfc846ed5b3
parent30b9732f21b90079b7e7cf21be1f1639dea24eaf
parentd80ccd34c68923ba58ff359601efb33192e3681c
Merge branch 'develop' of cvs2:WP-Themes/mountpleasantwow into develop

Conflicts:
css/app.css
css/app.css.map
css/app.css
scss/_blog.scss