diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-11-27 13:48:43 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-11-27 13:48:43 +0000 |
| commit | 83acbf953a4f50a017e3e857ecbd0b008f0b3be0 (patch) | |
| tree | 127a0bb3482fce953c2e53eddb99f7014df0ae0c /src/components/settings_modal/helpers/attachment_setting.js | |
| parent | b6accf9e7f7ef5f23cbf8bac57e54cefa0db4620 (diff) | |
| parent | 6c78b59c99e91c4d7b5002725863706d97a7bc29 (diff) | |
Merge branch 'release/2.6.x' into 'master'
merge 2.6.x to master since 2.6.1 release
See merge request pleroma/pleroma-fe!1874
Diffstat (limited to 'src/components/settings_modal/helpers/attachment_setting.js')
| -rw-r--r-- | src/components/settings_modal/helpers/attachment_setting.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/components/settings_modal/helpers/attachment_setting.js b/src/components/settings_modal/helpers/attachment_setting.js index ac5c6f86..c4c04b2b 100644 --- a/src/components/settings_modal/helpers/attachment_setting.js +++ b/src/components/settings_modal/helpers/attachment_setting.js @@ -7,6 +7,7 @@ export default { ...Setting, props: { ...Setting.props, + compact: Boolean, acceptTypes: { type: String, required: false, |