Merge branch 'hotfix/1.1.15' v1.1.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 10 May 2017 17:54:01 +0000 (13:54 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 10 May 2017 17:54:01 +0000 (13:54 -0400)
commit325c44a8cf5894c0b585cdfa7ad22b5e3a2ab120
treea7638b3b7e8785b5ddb4dca27ca054715516fda2
parentbd9976c0774cd7910d3ad19e672537ae0e0a777f
parent941ac26135332adb64bd382bff7aa0faa4768f19
Merge branch 'hotfix/1.1.15'