Merge branch 'hotfix/1.0.26' v1.0.26
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Oct 2018 18:50:57 +0000 (14:50 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Oct 2018 18:50:57 +0000 (14:50 -0400)
commit4848862137d47206319d92b1c3339e3634a31a02
tree3a834f7af0e2b30b39f7162829cc99be8551a292
parentaf11f87946cfcadda4965b327d4a6a2173ce50f3
parent977f22b74522cecd524de8a5e117dfd642191da4
Merge branch 'hotfix/1.0.26'