Merge branch 'hotfix/1.0.18' v1.0.18
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 20 Dec 2016 19:45:11 +0000 (14:45 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 20 Dec 2016 19:45:11 +0000 (14:45 -0500)
commit0849e91f4605b286d37e7799ca3119d21d70203d
treeb3d781faf331d80aac720972feb4884a468e98eb
parentf6b45de73abad705e1943247e3a937687edb561d
parentbdba9d05b0754c1891fb8e3846b0f451e599bcbd
Merge branch 'hotfix/1.0.18'