Merge branch 'hotfix/1.1.18' v1.1.18
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Dec 2017 18:27:47 +0000 (13:27 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Dec 2017 18:27:47 +0000 (13:27 -0500)
commit669eb35c527739f7becc332d9833473723d4fe21
treeb4ac942dc6c42c574b0826bba99c1d4e4b3a1d81
parentd5a3fd1b129b64a4b7d0e2411d4d961c75b76e49
parent5527cb3d262ec76394d82938ea2a9cd2272129ee
Merge branch 'hotfix/1.1.18'