Merge remote-tracking branch 'origin/develop' into feature/account-export
authorEgor Kislitsyn <egor@kislitsyn.com>
Fri, 30 Oct 2020 20:17:33 +0000 (00:17 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Fri, 30 Oct 2020 20:17:33 +0000 (00:17 +0400)
commita2a7a1f2ff31342756447ff04f964ca19ee668f1
tree5420d06e2212d9d30538d518ac6d0ddb275c5a5c
parentd2113428c027580f1cd4854f6610d64ee9643fd2
parent4fbdd1c8a12fd2b3dc6b63ccbbaa7d4241fa778e
Merge remote-tracking branch 'origin/develop' into feature/account-export
test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs