Merge branch 'hotfix/1.1.20' v1.1.20
authorLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 21:50:39 +0000 (16:50 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 21:50:39 +0000 (16:50 -0500)
commit3f4b8a1ef3285df28c539adae75e0df4055316f5
tree2ec38fb017064d52468f3b3b4504571c88d53ef8
parenta3f3c4f766dfaf7d4b36ddbb261f0897e18c224a
parent5ec4e2f879596a1bcea952248b556c35b5516703
Merge branch 'hotfix/1.1.20'