Merge branch 'hotfix/1.2' master v1.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Mar 2017 14:48:17 +0000 (10:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Mar 2017 14:48:17 +0000 (10:48 -0400)
commit6a773b2c39bb247b4ca80168cb5ebb8a7068b97e
tree95ebc5c6341091afe9619cc220c0bce1b6a69ea0
parent280a2eeaeed4304c8d9d372109cf72aea0fc3769
parentb213745c33cd516d88a7123475cd799b07039136
Merge branch 'hotfix/1.2'