Merge branch 'hotfix/1.2.7' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 17 Jun 2016 21:11:12 +0000 (17:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 17 Jun 2016 21:11:12 +0000 (17:11 -0400)
commitcbbb125fae1be7e11a6d8a2f60e5327ef376de3a
treee0c1a9e4a26d8c6d92edcdde8a319c2ec350f23e
parent66bfe2a6eb1bf3e43ef33c11d7ff8c3e4a7a2a8f
parent6304897036f3e214e8bc7f15f38089df910a4249
Merge branch 'hotfix/1.2.7' into develop