diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-03-05 16:29:21 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-03-05 16:29:21 +0000 |
| commit | 943fee9fbc3768733417033191540773ac76c711 (patch) | |
| tree | ee0ced4fab3b95a99f684dd08adb054a5ce934e3 /src/components/settings_modal/settings_modal_admin_content.js | |
| parent | db33d58ba7a91da3461556a8a296991cad53afa8 (diff) | |
| parent | 70258a21764fa72a34a6059e9902db1661a48382 (diff) | |
Merge branch 'admin-emoji-settings' into 'develop'
Admin emoji pack settings
See merge request pleroma/pleroma-fe!1886
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 () { |