Merge branch 'hotfix/1.0.36' v1.0.36
authorLaury GvR <laury@gaslightmedia.com>
Thu, 1 Nov 2018 14:37:50 +0000 (10:37 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 1 Nov 2018 14:37:50 +0000 (10:37 -0400)
commitc1d39fee47fac8686956ddc3459c459ef821dadb
tree6c52c16afe769739e1eda43b4032120bed9bfe5a
parentf90867a21f754e4e18775b5cb65da580fde41366
parente96e4abc048e0284b83b242eb712cfd399e783f6
Merge branch 'hotfix/1.0.36'