Merge branch 'hotfix/1.0.42' v1.0.42
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Oct 2017 14:59:54 +0000 (10:59 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Oct 2017 14:59:54 +0000 (10:59 -0400)
commita3467c422109683a3b2a2c5d0aaabccb3d8ca2e9
tree44334e2340a1c04079d716ea502a681a7a30c2ce
parent65f45c183c5aa3b72ef099314ad5498a801b95de
parent6ecd1fa254b7dc9295edbfffe1b66e296b4ec2b4
Merge branch 'hotfix/1.0.42'