diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-04-28 19:05:18 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-04-28 19:05:18 +0000 |
| commit | 51709ad31893714d98bf7c05cd37d1d07fde65ca (patch) | |
| tree | ace81acf8842a4063e12ae561f1a1a7de6aab2c6 /src/components/settings_modal/admin_tabs/instance_tab.vue | |
| parent | 4de9daa1144536f03c86d277b4ec1288dc9df432 (diff) | |
| parent | 3056017f8e35c98a7fb42162c7e3460a4ebab619 (diff) | |
Merge branch 'develop' into 'scrobbles-age'
# Conflicts:
# src/i18n/en.json
Diffstat (limited to 'src/components/settings_modal/admin_tabs/instance_tab.vue')
| -rw-r--r-- | src/components/settings_modal/admin_tabs/instance_tab.vue | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue index a0e3351e..32e8df25 100644 --- a/src/components/settings_modal/admin_tabs/instance_tab.vue +++ b/src/components/settings_modal/admin_tabs/instance_tab.vue @@ -8,7 +8,10 @@ </li> <!-- See https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3963 --> <li v-if="adminDraft[':pleroma'][':instance'][':favicon'] !== undefined"> - <AttachmentSetting compact path=":pleroma.:instance.:favicon" /> + <AttachmentSetting + compact + path=":pleroma.:instance.:favicon" + /> </li> <li> <StringSetting path=":pleroma.:instance.:email" /> @@ -20,7 +23,10 @@ <StringSetting path=":pleroma.:instance.:short_description" /> </li> <li> - <AttachmentSetting compact path=":pleroma.:instance.:instance_thumbnail" /> + <AttachmentSetting + compact + path=":pleroma.:instance.:instance_thumbnail" + /> </li> <li> <AttachmentSetting path=":pleroma.:instance.:background_image" /> |