Merge branch 'hotfix/1.0.18' v1.0.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 6 Mar 2018 15:15:52 +0000 (10:15 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 6 Mar 2018 15:15:52 +0000 (10:15 -0500)
commitb27e5139c88ee1af9e8a86a7e03f6eb64067aa87
tree366ed5b8cb66b3117355867b856c37bd170d0c86
parenteb38c5982e35d53a105e0319af04b6860e6b1ee4
parent1f263dec9f38f24139567f588c484196d69f9913
Merge branch 'hotfix/1.0.18'