Merge branch 'hotfix/1.0.16' v1.0.16
authorLaury GvR <laury@gaslightmedia.com>
Thu, 21 Sep 2017 20:36:14 +0000 (16:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 21 Sep 2017 20:36:14 +0000 (16:36 -0400)
commit030f2adcebec29d52d63f2262a1978d8cfa6015a
tree891586a4e9ad7f8cf690d072e6bee28c93b490b4
parent6ee75a13b9a6736c872e2e993094da8e7afcbe1d
parent4a3709b3a968820359ada32145b4a5bb4cf63737
Merge branch 'hotfix/1.0.16'