Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 20:37:28 +0000 (15:37 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 20:37:28 +0000 (15:37 -0500)
commitdd43f70278da28578910d1e66ab93b426e9a75ed
tree3747aed8c1c312530564882a1628c7fbdf608e0d
parent323a12e8a1faaf88b29dc7fbb5a4ac4acbba660a
parent8402bd0da524a02eca7123f3f14ad8f91c55a17e
Merge branch 'hotfix/1.0.4'