Merge branch 'hotfix/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:57:16 +0000 (12:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:57:16 +0000 (12:57 -0400)
commit16e4c423780fc6eedea8282e1d7c169e867c7811
treeec507f17f7af030031a0b638a0fd61d86b1d1826
parentad5f12ea5af98397f6a5d2b5c3ee99d14d737395
parentb8d01c50366998c8f3ea91e4e3f13bd43f4e023f
Merge branch 'hotfix/1.1.2'