Merge branch 'hotfix/1.0.21' v1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Wed, 2 May 2018 14:40:10 +0000 (10:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 2 May 2018 14:40:10 +0000 (10:40 -0400)
commit129a6695e5ac5dd43a860ab654cdb147574175a6
tree67e8057143fdbb175bf885f8378897b0f3a4fd76
parentf07cb4486281f51b9cd173a422076f896b2d73a5
parent6ecc770f7cd6252906885c15a6532889f1f1ceae
Merge branch 'hotfix/1.0.21'