Merge branch 'hotfix/1.0.20' v1.0.20
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:58:16 +0000 (10:58 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:58:16 +0000 (10:58 -0400)
commitb87518768831b8f27d6d432101d3ee4af581afe5
treefd36386f58491da989491cd360015a5cd3e40cd6
parentf1060abe3016307d885ff1e50860d472245ba06e
parent127145004fc8539c3683fea8ec486ecf02bc38ca
Merge branch 'hotfix/1.0.20'