Merge branch 'hotfix/1.0.7' master
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 22 Nov 2016 15:03:44 +0000 (10:03 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 22 Nov 2016 15:03:44 +0000 (10:03 -0500)
commita68a778084b0230b7d882d02df7f9ec84ff9d115
tree13a1576ed9242f3ee9b79135de8bf8c6b43026cc
parent5a6ef6b59f1236fa003b463252f100e0c66d3fb8
parentb7f43a02400e1ab1edf51a1468064d8445a2be48
Merge branch 'hotfix/1.0.7'