[Resolve merge conflicts

2020-09-19 14:19:40 +02:00 · 2020-09-19 14:19:40 +02:00 · 443310b1c4
commit 443310b1c4
parent a3923a825e a3c34f5f39
22 changed files with 76 additions and 129 deletions
--- a/evennia/web/webclient/static/webclient/js/plugins/goldenlayout.js
+++ b/evennia/web/webclient/static/webclient/js/plugins/goldenlayout.js
@ -535,6 +535,7 @@ let goldenlayout = (function () {
        onText: onText,
        getGL: function () { return myLayout; },
        addKnownType: addKnownType,
+        onTabCreate: onTabCreate,
    }
 }());
 window.plugin_handler.add("goldenlayout", goldenlayout);