Merge branch 'hotfix/1.0.18' v1.0.18
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Jan 2018 13:28:00 +0000 (08:28 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Jan 2018 13:28:00 +0000 (08:28 -0500)
commit482e6ce113c104b0efd038e1c35061d4338a9aba
tree4078d4fabb0bff158dd8bcd352006e7ce7c02264
parent6d2a854d74d63d6363f01f63ecaf741f4e74b7ca
parentbf81bd87cee5dc18bbd431bb6cef6f11bd13bd25
Merge branch 'hotfix/1.0.18'