diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-05-12 17:36:05 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-05-12 17:36:05 +0000 |
| commit | 5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7 (patch) | |
| tree | f4a7a9c10d00083b36fb331c1d9196dc391dcfc7 /src/components/settings_modal/settings_modal.js | |
| parent | a0f780c4550b77d4574e0de8932a2dff288784a3 (diff) | |
| parent | 0bc0a8d5f51f88858a7347b915361c45ff819292 (diff) | |
Merge branch 'rc/2.0.5' into 'master'
Update MASTER for 2.0.5 patch
See merge request pleroma/pleroma-fe!1105
Diffstat (limited to 'src/components/settings_modal/settings_modal.js')
0 files changed, 0 insertions, 0 deletions