Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:36:58 +0000 (13:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:36:58 +0000 (13:36 -0400)
commitb86bf4233174b32afd16bf6b2ba607676ae5334b
treeb0ac3fccff3bfa95b18f40d77210aa1fc8aab045
parentb17f9bafc4aa1268768719ce84d02a5714fd625a
parentde3c506fb65a146162273d7e037b93151bdcadfa
Merge branch 'hotfix/1.0.18'