diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-11-09 08:58:17 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-11-09 08:58:17 +0000 |
| commit | 3220e72eb9373adcf8c8831613b4bee96c988374 (patch) | |
| tree | f61d945ca103f96b42f4a8f0ff7ffe349194dae5 /src/components/settings_modal/helpers/string_setting.vue | |
| parent | def1bd0676ea407cbd02f0a1384b56e62cee6447 (diff) | |
| parent | 82f17961d1c8f092453adb0b6c42b38157a63677 (diff) | |
Merge branch 'patch-1' into 'develop'
Update CHANGELOG.md to match master
See merge request pleroma/pleroma-fe!1279
Diffstat (limited to 'src/components/settings_modal/helpers/string_setting.vue')
0 files changed, 0 insertions, 0 deletions