Merge branch 'hotfix/1.1.6' v1.1.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 20 Sep 2016 14:06:03 +0000 (10:06 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 20 Sep 2016 14:06:03 +0000 (10:06 -0400)
commit96c0b92dc8871e55bc140090b683abfe995a47c2
treef32bc80790f68673cf035e837e7512291dfb9a4a
parent1b34b6fddc30df97eb17e18af3273d8b475c0aae
parentc32f4844c1c26b2a8a8fad178c76c218a90bb489
Merge branch 'hotfix/1.1.6'