Merge branch 'hotfix/1.0.21' v1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jun 2018 20:04:32 +0000 (16:04 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jun 2018 20:04:32 +0000 (16:04 -0400)
commit06720202974eeed03b868b7ca8991dda513aa874
treee2780248f1968e4540556fae8a303012d7ef542a
parentf5a25af4ba962ac28a8df6cd443e582e36aec45b
parentb54f7ac89c5f419213bb496ade5d1386e7e5250e
Merge branch 'hotfix/1.0.21'