Merge branch 'hotfix/1.0.12' v1.0.12
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Jan 2018 18:27:40 +0000 (13:27 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Jan 2018 18:27:40 +0000 (13:27 -0500)
commit2c5c1064dda9a0b661ccdac0b71e8f1e55a6ca1b
tree6758a10f87f4b91ccddf99e69a1bae737eff66e6
parentc27f62fda58532db11c819233ec016c2ce11338f
parentb8567dae15f0fab155aced224a15e507898abaa2
Merge branch 'hotfix/1.0.12'