Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Wed, 25 Oct 2017 19:31:46 +0000 (15:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 25 Oct 2017 19:31:46 +0000 (15:31 -0400)
commit85d164034bbd4dbf85f6ffd8cccd101ff6e7baea
treeccf80ca8483d75aae04e5632e04f38a7934ea043
parentd94334c79e200c9433cbcf2571be6e4e2f2c7cd3
parent3aa0ef25114008d60faf29c385690d28780da307
Merge branch 'hotfix/1.0.6'