diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-07-31 16:31:06 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-07-31 16:31:06 +0000 |
| commit | 6bc020c733047d7033e508a2b4dffc581d703170 (patch) | |
| tree | fe52d41d57c827e8872da21e5ac10d412058f43e /src/components/settings_modal/settings_modal_admin_content.js | |
| parent | 83acbf953a4f50a017e3e857ecbd0b008f0b3be0 (diff) | |
| parent | 9d51eccf5dd0b4b773db5ec146d818b6c8fe18ac (diff) | |
Merge branch 'release/2.7.x' into 'master'
Release 2.7.0
See merge request pleroma/pleroma-fe!1928
Diffstat (limited to 'src/components/settings_modal/settings_modal_admin_content.js')
| -rw-r--r-- | src/components/settings_modal/settings_modal_admin_content.js | 4 |
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 () { |