Merge branch 'hotfix/1.1.1' v1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Wed, 3 Aug 2016 12:20:10 +0000 (08:20 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 3 Aug 2016 12:20:10 +0000 (08:20 -0400)
commitfa55a8b617021d18385273301bc4357f48864ca7
tree4a865ddb856bef449eb6321e7aeedfa73323fe88
parent7fd0e5d1dae8da37098a1e87b9c773530adae842
parent50a43f0b71e8b51e37c2fc75d9820a01bae8efa8
Merge branch 'hotfix/1.1.1'