Merge branch 'develop' into admin-be
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Tue, 21 Jan 2020 07:32:27 +0000 (10:32 +0300)
committerAlexander Strizhakov <alex.strizhakov@gmail.com>
Tue, 21 Jan 2020 07:32:27 +0000 (10:32 +0300)
commit503d966e9f7d4c41a1bfbd215b375443a858564a
tree634499f234fcd8d9f2b81523c66eaaf339ee52f8
parentdcae5914d1f7d540e3c20be5988d5e3547a349cd
parentab36459464311389c2929ff1c48537889066a9f8
Merge branch 'develop' into admin-be
config/config.exs
lib/pleroma/web/admin_api/admin_api_controller.ex
test/web/admin_api/admin_api_controller_test.exs