diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-03-20 20:31:20 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-03-20 20:31:20 +0000 |
| commit | fa532b1f005220743d036b7d103c47a043be7ae4 (patch) | |
| tree | 09d5e4d409f7298a328e3feaac6a062e9082df4d /src/components/settings_modal/tabs/general_tab.js | |
| parent | 19618db1929f1aea6183de3102581844298d1d39 (diff) | |
| parent | 493120b5456282756d05d9afaf66b11a2f87d8fc (diff) | |
Merge branch 'pleroma-akkoma-emoji-port' into 'develop'
Custom emoji reaction support
See merge request pleroma/pleroma-fe!1792
Diffstat (limited to 'src/components/settings_modal/tabs/general_tab.js')
| -rw-r--r-- | src/components/settings_modal/tabs/general_tab.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js index ea24d6ad..be97710f 100644 --- a/src/components/settings_modal/tabs/general_tab.js +++ b/src/components/settings_modal/tabs/general_tab.js @@ -2,6 +2,7 @@ import BooleanSetting from '../helpers/boolean_setting.vue' import ChoiceSetting from '../helpers/choice_setting.vue' import ScopeSelector from 'src/components/scope_selector/scope_selector.vue' import IntegerSetting from '../helpers/integer_setting.vue' +import FloatSetting from '../helpers/float_setting.vue' import SizeSetting, { defaultHorizontalUnits } from '../helpers/size_setting.vue' import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue' @@ -62,6 +63,7 @@ const GeneralTab = { BooleanSetting, ChoiceSetting, IntegerSetting, + FloatSetting, SizeSetting, InterfaceLanguageSwitcher, ScopeSelector, |