Merge branch 'hotfix/1.1.15' v1.1.15
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:09:25 +0000 (16:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:09:25 +0000 (16:09 -0400)
commitbde77190268fcc09b67c558dddb8ca1f74da1433
tree3917a7725e4a24ade7b00bd4c6cbf53942ce8505
parent7f019995cbaabc5c26f19e90f01f68c78c098f19
parentf71c6649b86748c0b95978aef97bf3b8c7fa3da4
Merge branch 'hotfix/1.1.15'