Merge tag 'v1.0.1' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 24 Aug 2018 15:20:56 +0000 (11:20 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 24 Aug 2018 15:20:56 +0000 (11:20 -0400)
hotfix to fix branch issues

1  2 
footer.php

diff --cc footer.php
Simple merge