Merge branch 'hotfix/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Fri, 30 Jun 2017 18:53:21 +0000 (14:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 30 Jun 2017 18:53:21 +0000 (14:53 -0400)
commit96c6e08a7096f54da17b45c0d324100093e5cde4
tree5ce819bfdc19b029316c9289a114d47687954e89
parent68d54da4356a5f309014cc65a9c9b253e003deb5
parent514d59e893149abadc3f01483978e07913125a63
Merge branch 'hotfix/1.0.15'