Merge branch 'hotfix/1.1.8' v1.1.8
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 28 Nov 2016 13:46:02 +0000 (08:46 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 28 Nov 2016 13:46:02 +0000 (08:46 -0500)
commit5e58660b6a4d1ea613a09010fb80a5e525c4b2c3
tree90c7e334bb28e21d30ad391216ba678cd3f1673a
parent2feb54be6fee64c5272b65d1a1292982cfa68e47
parentd5593de48574a3b88e73b9bb7fbfcadb73b5f2ce
Merge branch 'hotfix/1.1.8'