From: laury <laury@gaslightmedia.com>
Date: Fri, 9 Nov 2018 18:35:08 +0000 (-0500)
Subject: Merge branch 'master' into release/1.2.39
X-Git-Tag: v1.2.39^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=75e03ea720e197800eeea22ee2eafb9c63e536d7;p=WP-Themes%2Fmountpleasantwow.git

Merge branch 'master' into release/1.2.39

Conflicts:
	header.php
	style.css
---

75e03ea720e197800eeea22ee2eafb9c63e536d7