minibikini 6163fbf553 Merge branch 'develop' into 'frontend-admin-api' ... # Conflicts: # lib/pleroma/web/router.ex		2020-11-02 10:43:45 +00:00
..
admin_api_controller_test.exs	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-31 00:17:33 +04:00
chat_controller_test.exs	Remove unused aliases	2020-10-30 18:42:43 +04:00
config_controller_test.exs	tests consistency	2020-10-13 16:35:09 +03:00
frontend_controller_test.exs	Add support for install via file and build_url params	2020-10-29 16:37:50 +04:00
instance_document_controller_test.exs	Remove unused aliases	2020-10-30 18:42:43 +04:00
invite_controller_test.exs	tests consistency	2020-10-13 16:35:09 +03:00
media_proxy_cache_controller_test.exs	tests consistency	2020-10-13 16:35:09 +03:00
o_auth_app_controller_test.exs	Remove unused aliases	2020-10-30 18:42:43 +04:00
relay_controller_test.exs	Remove unused aliases	2020-10-30 18:42:43 +04:00
report_controller_test.exs	Remove unused aliases	2020-10-30 18:42:43 +04:00
status_controller_test.exs	Remove unused aliases	2020-10-30 18:42:43 +04:00
user_controller_test.exs	Remove unused aliases	2020-10-30 18:42:43 +04:00