Merge branch 'hotfix/1.2.17' v1.2.17
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 21:57:50 +0000 (16:57 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 21:57:50 +0000 (16:57 -0500)
commit5ba08e8499ccefe18dd2c2a1efce8fe1682ba732
tree3e50c3e559f40f27e289339c84a6fd4607bbf477
parenta4762322b27be57a652484865048d4f353aeedc0
parentdcfce506b036804f672122bf5b90516209766b1d
Merge branch 'hotfix/1.2.17'