Merge remote-tracking branch 'upstream/develop' into by-approval
authorAlex Gleason <alex@alexgleason.me>
Tue, 14 Jul 2020 23:56:40 +0000 (18:56 -0500)
committerAlex Gleason <alex@alexgleason.me>
Tue, 14 Jul 2020 23:56:40 +0000 (18:56 -0500)
commit48983e942139a81106416cfbb8d22743b6764053
tree1c11c31848609a9e6b8226bc6ac77d3747e1986a
parentdf3d1bf5e57389e41a70676ccab1df81d83e3d74
parent3f65f2ea79644cd8a119fc154c2792994723c7cb
Merge remote-tracking branch 'upstream/develop' into by-approval
CHANGELOG.md
config/description.exs
docs/configuration/cheatsheet.md
lib/pleroma/user.ex
test/web/admin_api/controllers/admin_api_controller_test.exs