Merge branch 'hotfix/1.0.13' v1.0.13
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Feb 2017 20:21:24 +0000 (15:21 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Feb 2017 20:21:24 +0000 (15:21 -0500)
commit3f4ea7e71f55d7b4e2c193ec4695b0a28678fdd4
tree5ee3b9d02bf14fa65b8aba4be79392381f2edf7a
parent2a2fd9e62489238f57cc7b42a06a6f4a80dc7da5
parent0caa61e02b8a307b2f499f16b0b82768a31c1198
Merge branch 'hotfix/1.0.13'