From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 20 Dec 2016 19:47:30 +0000 (-0500)
Subject: Merge tag 'v1.0.18' into develop
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=b43755aba0e1dd5d883542293c99a86d47283362;p=WP-Themes%2FTomsMomsCookies.git

Merge tag 'v1.0.18' into develop

Hotfix 1.0.18

Conflicts:
	functions.php
---

b43755aba0e1dd5d883542293c99a86d47283362