Merge branch 'hotfix/1.2.7'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Sep 2016 15:30:49 +0000 (11:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Sep 2016 15:30:49 +0000 (11:30 -0400)
commit137504a6e5f6403456380ac8607dc8de76b40fb4
tree2a1b228b8e2d1dcb20a8c28e4d80e560305c96e0
parentd3e77a4731775f86fdf0e9881ad4c8b5a02c91de
parent5c41e00ad5d6454d226ea3f3ce7d953ab57b0549
Merge branch 'hotfix/1.2.7'