Merge branch 'hotfix/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Wed, 3 Aug 2016 12:35:22 +0000 (08:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 3 Aug 2016 12:35:22 +0000 (08:35 -0400)
commitf6c8dd32196bd1369d941d6b5e637802a86a4151
tree2ff226d3d05a4d4365dcde7de20c544e6bf3fb76
parentfa55a8b617021d18385273301bc4357f48864ca7
parentf1f2ed3359d4a10ab39f9cf570df7e554ece8374
Merge branch 'hotfix/1.1.2'