Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Feb 2017 21:47:28 +0000 (16:47 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Feb 2017 21:47:28 +0000 (16:47 -0500)
commit2a2fd9e62489238f57cc7b42a06a6f4a80dc7da5
treebc79062cab3a54a4ae2110572d6be42246b8c475
parentaca8b616a6e4046cf8dc0450fb17fa255d6ab011
parent0d8fbfcbd64a405e2768f5e49c00455e5a869270
Merge branch 'hotfix/1.0.12'