diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-12-23 18:15:52 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-12-23 18:15:52 +0000 |
commit | b367f22256edaa3536a7b2d6dea41fd472870181 (patch) | |
tree | 42d0eceee6638bf0e0573ebb1f4f430c5de55fe5 /docs/configuration | |
parent | 6bce88b9e7876d32ea9146a580454053f0ef3790 (diff) | |
parent | 6126f203d3f11e3f97155757c73a4107a04e9544 (diff) | |
download | pleroma-b367f22256edaa3536a7b2d6dea41fd472870181.tar.gz pleroma-b367f22256edaa3536a7b2d6dea41fd472870181.zip |
Merge branch 'mergeback/2.5.0' into 'develop'
Mergeback: 2.5.0
See merge request pleroma/pleroma!3817
Diffstat (limited to 'docs/configuration')
0 files changed, 0 insertions, 0 deletions