Merge branch 'hotfix/1.1.0' V1.1.0
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 21:02:14 +0000 (16:02 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 21:02:14 +0000 (16:02 -0500)
commit448d31cbdd6310816b78679c2186f140c6be14ad
tree31f8334adf57174b3358a39dffe79ee4e7a67011
parentf9e688405f5f294f24d80b8176a77e2742323282
parentca00a47a1aad96260c2873eddc04f20c8de8a844
Merge branch 'hotfix/1.1.0'