Merge branch 'hotfix/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Sep 2017 18:18:33 +0000 (14:18 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Sep 2017 18:18:33 +0000 (14:18 -0400)
commit43d25bd614017dab927b8fe400abe1a6597c9b87
treeacae0901e99f90e9cef1dd216b69be6be8793508
parent62dd23bda19e9203a6fb973b58ad96c58bbdccd7
parent3186b2e2127ebcb86ab1af43ec7f8cec2be8c1b3
Merge branch 'hotfix/1.0.6'