Merge branch 'hotfix/1.2.60' v1.2.60
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 25 Mar 2019 20:40:40 +0000 (16:40 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 25 Mar 2019 20:40:40 +0000 (16:40 -0400)
commit4434dd644f872c77d44377789131cee2fa5b81c3
tree87dc1cd16fc52dbc64aaa77a18eedf1a3f0b642f
parent558d9af7fa7072451ff042a860a0c0ba06bf24ea
parentde22bc0f81889a66a9d64f195a4b68d89601acfe
Merge branch 'hotfix/1.2.60'