Merge branch 'hotfix/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:27:24 +0000 (16:27 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:27:24 +0000 (16:27 -0400)
commit0ca2e456c247853013df64dc627253075238fb90
tree1bdb53bba6b6a6e3757c0866602e96514e97cc19
parent22df876a07c94eeddf457994e1555f48d3f2bb67
parent1de2fcc2b81cdb87e17d722ca4f701b3277a7dec
Merge branch 'hotfix/1.0.15'