Merge branch 'hotfix/1.1.1' V1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 21:30:57 +0000 (16:30 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 21:30:57 +0000 (16:30 -0500)
commit32190c70a103fec1a153242b7a103d0a89a8d288
treeaa39c2227deb0bdaca99f8b12f8f7f426c2ca9c8
parent448d31cbdd6310816b78679c2186f140c6be14ad
parent9d4b658389ce9e9e80ba51980108d80177a7a5d9
Merge branch 'hotfix/1.1.1'