Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 21 Dec 2016 20:25:35 +0000 (15:25 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 21 Dec 2016 20:25:35 +0000 (15:25 -0500)
commitd659e8ca405f3394ac4b05d3be6d11aa49cb0883
treec863145053f938a82a754404ee78aa092541ddc2
parent1f612ad40b1b334d9126c7e4a9121ee575602cf7
parentddab840e32755987e0749d728233cd90c403f118
Merge branch 'hotfix/1.0.4'