Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Mon, 7 May 2018 18:06:10 +0000 (14:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 7 May 2018 18:06:10 +0000 (14:06 -0400)
commit651946b0a7a756997cd381cdcb8c4dc6a2415383
treedc3477752ac2fd17b44179002778a3088831e997
parent4cadd9340c8405975fa153e64dd1ae8ae278bbec
parent041020dbeb5f238d8b1af9c15864ac04966d9c0f
Merge branch 'hotfix/1.0.12'