Merge branch 'hotfix/1.0.26' v1.0.26
authorLaury GvR <laury@gaslightmedia.com>
Thu, 21 Jul 2016 12:49:21 +0000 (08:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 21 Jul 2016 12:49:21 +0000 (08:49 -0400)
commit85b1946487a1334bed4c33cf63bdcb7c9765ad0a
treed0289e22b947a6a3bef3c07fb7d30c8664e30af1
parentbc7cfc92736f44b02d1a3c40bd124053d861309c
parent54fa4d97bd3928a2befb125570349b669a6b7eb8
Merge branch 'hotfix/1.0.26'