Merge branch 'hotfix/1.2.4' v1.2.4
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Jan 2019 20:02:21 +0000 (15:02 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Jan 2019 20:02:21 +0000 (15:02 -0500)
commit2f64533ae1ffe01a6ee4831cd805d1b191aa1893
tree02ebfc5f2625fca003f27817e34593bc16299fdb
parent442cd47d659c2af4a2cd38ac8424a05bb1a6c110
parent0dad26a32294d99396861ca66911fd10091f280c
Merge branch 'hotfix/1.2.4'