Merge branch 'hotfix/1.0.20' v1.0.20
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Nov 2017 19:22:48 +0000 (14:22 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Nov 2017 19:22:48 +0000 (14:22 -0500)
commit0ceb49b6661bce4036178fa37acea41b893a327f
tree84ffcb4060bc5abd64327a796be07109eedaf6e6
parent883f2da1aff0ef6eb6fded574f650a1389f742dc
parentc7fdbb48eb5ce067b8348f59ccc5c3afe9383805
Merge branch 'hotfix/1.0.20'