Merge branch 'hotfix/1.2.8'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Sep 2016 15:33:04 +0000 (11:33 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Sep 2016 15:33:04 +0000 (11:33 -0400)
commit6ff58aee447d43819ebe6ad0b140ccdda27e473d
treeaf8fdc883616861ccbc499b159f6f35a1cdca3dd
parent137504a6e5f6403456380ac8607dc8de76b40fb4
parent07bdbe2964ce439136d86bc80ca88f1b3bdabafe
Merge branch 'hotfix/1.2.8'