Merge tag 'v1.0.12' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 8 Feb 2018 21:46:55 +0000 (16:46 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 8 Feb 2018 21:46:55 +0000 (16:46 -0500)
commit077575559feabd3a16c3c113176eef2093500bcb
treeec332d928ab34613f526824f2f9afcd9eae1d8e5
parent3ccf75d0b25e74e1db85d34d8ea8c378d2b7652d
parent1b58b216a3f9173534200db41b43a85a3bbeff76
Merge tag 'v1.0.12' into develop

fixing git conflict in header
header.php