Merge branch 'hotfix/1.0.11' v1.0.11
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Jan 2018 15:03:36 +0000 (10:03 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Jan 2018 15:03:36 +0000 (10:03 -0500)
commitdf02a647a53b76deccfab46a3faeb0b5ae1446ee
tree30095042c7f68cdbde4e1da8abc2c933547b0f89
parenta10cbb6ebf866710613b00d8f3081eeaf0168371
parent2b797b47d865f2a5cb198fc1c4dab81ec84bdff3
Merge branch 'hotfix/1.0.11'