diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-12-23 13:25:02 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-12-23 13:25:02 +0000 |
| commit | 25e628efe265db583797fe1c10fdcab2f0d9cc9d (patch) | |
| tree | 450f241149cae93c602819db824cef0d39842979 /src/components/settings_modal/helpers/choice_setting.vue | |
| parent | 75754168b24eda97fa9891ec26151fed853bc7d3 (diff) | |
| parent | 045459c75c4f9e9861fd553bd9ece1d73b05f69e (diff) | |
Merge branch 'fix-master-conflicts' into 'develop'
fix master/develop merge conflicts
See merge request pleroma/pleroma-fe!1712
Diffstat (limited to 'src/components/settings_modal/helpers/choice_setting.vue')
0 files changed, 0 insertions, 0 deletions