aboutsummaryrefslogtreecommitdiff
path: root/src/components/settings_modal/helpers/choice_setting.vue
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2023-05-12 14:07:33 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2023-05-12 14:07:33 +0000
commitfca1e0abaefaaf4158cf94afdcd8442852c554c5 (patch)
tree9172df205f6b4b0244a2435aa99896e68c7ba3c2 /src/components/settings_modal/helpers/choice_setting.vue
parentf5891e950ef62523dff0c66f6a34c4742fe4fb23 (diff)
parent4b38fc5ffcad8fe9cce81a64d418c41480d6a97f (diff)
Merge branch 'tusooa/custom-emoji-selective' into 'develop'
Fix custom emojis shown in selector if backend does not support it See merge request pleroma/pleroma-fe!1823
Diffstat (limited to 'src/components/settings_modal/helpers/choice_setting.vue')
0 files changed, 0 insertions, 0 deletions