Merge tag 'v1.0.18' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 20 Dec 2016 19:47:30 +0000 (14:47 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 20 Dec 2016 19:47:30 +0000 (14:47 -0500)
commitb43755aba0e1dd5d883542293c99a86d47283362
treeb3d781faf331d80aac720972feb4884a468e98eb
parent7c69c26fbd4b9bf4227a08894074abdaff485ffd
parent0849e91f4605b286d37e7799ca3119d21d70203d
Merge tag 'v1.0.18' into develop

Hotfix 1.0.18

Conflicts:
functions.php