Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 10 Jul 2020 08:55:15 +0000 (08:55 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 10 Jul 2020 08:55:15 +0000 (08:55 +0000)
commit4ac6e6283f6e090588ad56066b1e552b895f3a24
treec6536c1ab63ea26913b649cc3f64cea438b62f38
parentc2be0da79fcc95399647b292e0b9a4119d3dcdf1
parent5ea638757210c34b40fb568e537082b78f4118a6
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md