Merge branch 'hotfix/1.0.30' v1.0.30
authorLaury GvR <laury@gaslightmedia.com>
Tue, 22 May 2018 20:54:18 +0000 (16:54 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 22 May 2018 20:54:18 +0000 (16:54 -0400)
commitc7127f6547ff5e4a9bcfb858e27435a9cdfcd3e2
tree2e9476a3f4992bbedc7fae9ca2f0020196442c20
parentc3b50ba4e754453c89bf3234a4e8dd008fbd4378
parent8d3b0abcf2c593aa18be39494b49730551ee10da
Merge branch 'hotfix/1.0.30'