Merge branch 'develop' into admin-be
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Sat, 11 Jan 2020 09:15:42 +0000 (12:15 +0300)
committerAlexander Strizhakov <alex.strizhakov@gmail.com>
Sat, 11 Jan 2020 09:15:42 +0000 (12:15 +0300)
commit1630ecaa20894c6e18b83ce1a830184d577150c3
tree877c35b3441ca7431ead3d528ae07f1b8e36d62b
parent3453b27015dfa26bc6fd59899541eadfce2cacee
parent05ca420c0994b079116b40ea5a84214b50d56d0e
Merge branch 'develop' into admin-be
lib/pleroma/web/admin_api/admin_api_controller.ex
test/support/factory.ex
test/web/admin_api/admin_api_controller_test.exs