Merge branch 'hotfix/1.2.24' v1.2.24
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 26 Feb 2018 12:58:42 +0000 (07:58 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 26 Feb 2018 12:58:42 +0000 (07:58 -0500)
commitb937cb2e8f975291c83d790439e07c338f5efae6
tree220d0f1f4ce5974d7d594d8df2c48f0234e69f30
parentee03d314fe42740ef3554f09b9610b9b4831e1ca
parent287a4b2d520598253fb3d046c8ba1f478f677fb9
Merge branch 'hotfix/1.2.24'