Merge branch 'hotfix/1.1.0' v1.1.0
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Dec 2015 17:20:31 +0000 (12:20 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Dec 2015 17:20:31 +0000 (12:20 -0500)
commit2f957191f55a97e95d318858965989ac2b8b2976
tree281b3223dd44f313a44e329468014b33767d9150
parent54e374551832cb0df24f9d29fe1025e0cc1bbc4a
parent87bfcb00204c75f472d4633905bdce20933f7082
Merge branch 'hotfix/1.1.0'