Merge branch 'hotfix/1.1.8' v1.1.8
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Apr 2016 20:31:04 +0000 (16:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Apr 2016 20:31:04 +0000 (16:31 -0400)
commitffbd5dbd923390aa9f8799af41ff8dab06cc7283
tree930f72a16fb8938098ee02b871b5b545c2e9f2e4
parentfee0357fb32065b1befef42a95f05defe4407eb1
parent4aff0c3e69cb6dfe396386007592197360ff5ff2
Merge branch 'hotfix/1.1.8'