Merge branch 'hotfix/1.0.18'
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Jul 2016 19:38:58 +0000 (15:38 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Jul 2016 19:38:58 +0000 (15:38 -0400)
commit370a658e63f9324c400a48a0ac86679e2281cea9
tree91492c1ad74ccbbaebe611af4524944ae12f7def
parent46d39d49e115a207474faed53adc9579a9543da5
parentd6fbc40761ea3f298f1faa8afe789e3f7704bbf0
Merge branch 'hotfix/1.0.18'