diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-05-26 22:16:18 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-05-26 22:16:18 +0000 |
| commit | 31ec5cd35eece97aa1213c401b40d3ab83689ea9 (patch) | |
| tree | e82765f2adf9213d429cbcbe97e1fe961e33a53f /docs/configuration | |
| parent | cd9d6a12abb745f6a060434c13ca6d85f43a4e02 (diff) | |
| parent | 869f0d24a640ccdd0e075939abae5edae5f4cc84 (diff) | |
| download | pleroma-31ec5cd35eece97aa1213c401b40d3ab83689ea9.tar.gz pleroma-31ec5cd35eece97aa1213c401b40d3ab83689ea9.zip | |
Merge branch 'mergeback/2.5.2' into 'develop'
Mergeback: 2.5.2
Closes #3030, #3062, and #3045
See merge request pleroma/pleroma!3893
Diffstat (limited to 'docs/configuration')
0 files changed, 0 insertions, 0 deletions