diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-10 08:55:15 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-10 08:55:15 +0000 |
commit | 4ac6e6283f6e090588ad56066b1e552b895f3a24 (patch) | |
tree | c6536c1ab63ea26913b649cc3f64cea438b62f38 /docs/administration | |
parent | c2be0da79fcc95399647b292e0b9a4119d3dcdf1 (diff) | |
parent | 5ea638757210c34b40fb568e537082b78f4118a6 (diff) | |
download | pleroma-4ac6e6283f6e090588ad56066b1e552b895f3a24.tar.gz |
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'docs/administration')
0 files changed, 0 insertions, 0 deletions