Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Tue, 23 May 2017 14:49:09 +0000 (10:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 23 May 2017 14:49:09 +0000 (10:49 -0400)
commit90057ed3a0ace623b2890259723a575ccd3aece0
tree9cfe74e9ef0d8e5f989ff7bb5dbfc930dd6dc6a8
parent2052065106f559c4891e0ae3b5df47519dc720c7
parentb86bfbd471594cd0d2fcf053f07523a87805a613
Merge branch 'hotfix/1.0.18'