diff options
| author | feld <feld@feld.me> | 2022-11-14 14:03:11 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2022-11-14 14:03:11 +0000 |
| commit | a9d991d31e5ba00b857dc6f147d50df2473545d3 (patch) | |
| tree | 3ee87840897c0cf702ad5b543d1b24de90708b31 /docs/configuration | |
| parent | 39b24cdce683471372e2144dc00ed5d0f78740aa (diff) | |
| parent | 0e1356ef9cc8c97afcc3242cfb8182a706c85276 (diff) | |
| download | pleroma-a9d991d31e5ba00b857dc6f147d50df2473545d3.tar.gz pleroma-a9d991d31e5ba00b857dc6f147d50df2473545d3.zip | |
Merge branch 'develop' into 'akoma/deactivated-users'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'docs/configuration')
0 files changed, 0 insertions, 0 deletions