Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Wed, 16 Aug 2017 20:30:26 +0000 (16:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 16 Aug 2017 20:30:26 +0000 (16:30 -0400)
commit4f38cb42b29eaa73146a0949ee0477b9ba0866f8
treedb26035f67f103628647f0c6624d774eb2f9b2be
parentfa582f8cd3332695350c87cfa38f288e784ede63
parentc1f485399c133620ca637d438b295676ce3fa599
Merge branch 'hotfix/1.0.6'