Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Tue, 31 Oct 2017 18:48:33 +0000 (14:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 31 Oct 2017 18:48:33 +0000 (14:48 -0400)
commite8ab0deee4da10687d003ee7337196597e21b429
tree5c5f99e1e185e16d97a2b9700dd6b1f0e420fc9f
parent78da893d2e710a43a46c689d76ab0de74871d51b
parentbffbc447439fc8a86e292fada9690bf5b403b39d
Merge branch 'hotfix/1.0.18'