Merge branch 'hotfix/1.0.29' v1.0.29
authorLaury GvR <laury@gaslightmedia.com>
Fri, 11 Nov 2016 19:07:25 +0000 (14:07 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 11 Nov 2016 19:07:25 +0000 (14:07 -0500)
commit1853f932e736d3f149b5855e0d4a7730e38b6f51
tree6ea9e1e68463169d06492868adbc2977127410c7
parentecc04613ffb6abc8058ccc3315ceb4eaa6a5f37f
parent6b84f8f28872075225c7265272a7d3cf983e47f5
Merge branch 'hotfix/1.0.29'