Merge branch 'hotfix/1.0.16' v1.0.16
authorLaury GvR <laury@gaslightmedia.com>
Fri, 20 Apr 2018 16:06:40 +0000 (12:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 20 Apr 2018 16:06:40 +0000 (12:06 -0400)
commitf5add137941da3b7da14d71b9fc7b8ce0ddc8ab7
treea8e2d52dc9cb09468ac4ed318ee6dfd048e0385d
parent8776139d0730092e6b30964fb0d5981c976bc194
parentd0765c49beece2793a799b338b221e6812775687
Merge branch 'hotfix/1.0.16'