diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-11-27 13:26:01 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-11-27 13:26:01 +0000 |
| commit | d21e3d5de28afc1725e256370326f5c119d7a736 (patch) | |
| tree | f7f2045d510646bd6da64217f5de9b802002f0a3 /src/components/settings_modal/admin_tabs/instance_tab.vue | |
| parent | 18c0cf1845a95db2d0e894d2455cdd4dc545aaf7 (diff) | |
| parent | b707a14b10717e037e564b5f0eab3e0a7ceb0b37 (diff) | |
Merge branch 'admin-dashboard-fixes' into 'develop'
Fixes and minor improvements for admin dashboard
See merge request pleroma/pleroma-fe!1863
Diffstat (limited to 'src/components/settings_modal/admin_tabs/instance_tab.vue')
| -rw-r--r-- | src/components/settings_modal/admin_tabs/instance_tab.vue | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue index a6be776b..a0e3351e 100644 --- a/src/components/settings_modal/admin_tabs/instance_tab.vue +++ b/src/components/settings_modal/admin_tabs/instance_tab.vue @@ -6,6 +6,10 @@ <li> <StringSetting path=":pleroma.:instance.:name" /> </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" /> + </li> <li> <StringSetting path=":pleroma.:instance.:email" /> </li> @@ -16,7 +20,7 @@ <StringSetting path=":pleroma.:instance.:short_description" /> </li> <li> - <AttachmentSetting path=":pleroma.:instance.:instance_thumbnail" /> + <AttachmentSetting compact path=":pleroma.:instance.:instance_thumbnail" /> </li> <li> <AttachmentSetting path=":pleroma.:instance.:background_image" /> |