Merge remote-tracking branch 'origin/develop' into feature/account-export
authorEgor Kislitsyn <egor@kislitsyn.com>
Fri, 30 Oct 2020 15:34:02 +0000 (19:34 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Fri, 30 Oct 2020 15:34:02 +0000 (19:34 +0400)
commitd2113428c027580f1cd4854f6610d64ee9643fd2
tree36f419da14980da0fcad0e1802e7e627a5540d48
parent4a2d7a7a5db2544ffc84e1f0eb0dc86e1cb3c32c
parent131f3219e6b895139c5647cd2050dd22adce7139
Merge remote-tracking branch 'origin/develop' into feature/account-export
CHANGELOG.md
config/description.exs
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
lib/pleroma/web/router.ex
test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs