diff options
| author |  f0x52 <f0x@cthu.lu> | 2022-11-08 20:50:37 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-11-08 20:50:37 +0100 |
| commit | ad08c6c22987d31d9ead0429aae5fb84555b3cc2 (patch) | |
| tree | 2e6af117ba983c3c575c7f5710ecd4c22bee570e /web/source/settings/admin/settings.js | |
| parent | [feature] Make instance thumbnail configurable via admin panel (#973) (diff) | |
| download | gotosocial-ad08c6c22987d31d9ead0429aae5fb84555b3cc2.tar.xz | |
[frontend] fix conflict introduced by merge (#1007)
Diffstat (limited to 'web/source/settings/admin/settings.js')
| -rw-r--r-- | web/source/settings/admin/settings.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/source/settings/admin/settings.js b/web/source/settings/admin/settings.js index 88f32624a..ae9207f36 100644 --- a/web/source/settings/admin/settings.js +++ b/web/source/settings/admin/settings.js @@ -31,7 +31,7 @@ const adminActions = require("../redux/reducers/instances").actions; const { TextInput, TextArea, - _File + File } = require("../components/form-fields").formFields(adminActions.setAdminSettingsVal, (state) => state.instances.adminSettings); module.exports = function AdminSettings() { |