Merge branch 'hotfix/1.6.12' v1.6.12
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 18:55:05 +0000 (13:55 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 18:55:05 +0000 (13:55 -0500)
commit7bcc1e49499138db788f4b7b9f16ad65374e1f4d
treed58d25e0cf807154659f9f67b7c0adb272415c83
parent70cd784a75237aae320635c6138589e3bcfdb543
parent1c0605fe3569f9a4d8451b97c5808f866ffc90a3
Merge branch 'hotfix/1.6.12'