aboutsummaryrefslogtreecommitdiff
path: root/src/components/settings_modal/settings_modal_admin_content.js
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2024-03-06 09:35:46 +0200
committerHenry Jameson <me@hjkos.com>2024-03-06 09:35:46 +0200
commit962bce5ee3cdff421fcf54dfc4ea2f1af882665c (patch)
tree3bf37c553bb66e54fe8b601afa0e5a5aa56c5e54 /src/components/settings_modal/settings_modal_admin_content.js
parent3239bd34dfd60d7836d42b69bb62912f66af29d6 (diff)
parent943fee9fbc3768733417033191540773ac76c711 (diff)
Merge remote-tracking branch 'origin/develop' into themes3
Diffstat (limited to 'src/components/settings_modal/settings_modal_admin_content.js')
-rw-r--r--src/components/settings_modal/settings_modal_admin_content.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/settings_modal/settings_modal_admin_content.js b/src/components/settings_modal/settings_modal_admin_content.js
index f94721ec..ce835bf2 100644
--- a/src/components/settings_modal/settings_modal_admin_content.js
+++ b/src/components/settings_modal/settings_modal_admin_content.js
@@ -3,6 +3,7 @@ import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
import InstanceTab from './admin_tabs/instance_tab.vue'
import LimitsTab from './admin_tabs/limits_tab.vue'
import FrontendsTab from './admin_tabs/frontends_tab.vue'
+import EmojiTab from './admin_tabs/emoji_tab.vue'
import { library } from '@fortawesome/fontawesome-svg-core'
import {
@@ -33,7 +34,8 @@ const SettingsModalAdminContent = {
InstanceTab,
LimitsTab,
- FrontendsTab
+ FrontendsTab,
+ EmojiTab
},
computed: {
user () {