Merge tag 'v1.0.3' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 22 Mar 2017 12:42:00 +0000 (08:42 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 22 Mar 2017 12:42:00 +0000 (08:42 -0400)
commite29503be8f04ce1dc5af89617f9cef738d65d6a5
tree91ba0d64662dcdb4ce8bdf2b2e5c2828cb550586
parent981d1e8dafafdb2798c8d1c2ff7ff4d6a2fe90f4
parente1a96702d567a6f64d54c6d5b075c0c0f5170847
Merge tag 'v1.0.3' into develop

adding twitter icon to the header

Conflicts:
header.php
header.php