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.ex	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-30 19:34:02 +04:00
chat_controller.ex	changes after rebase	2020-10-13 16:44:03 +03:00
config_controller.ex	OAuthScopesPlug module name	2020-10-13 16:43:54 +03:00
fallback_controller.ex	proper error codes for error in adminFE	2020-06-20 13:53:57 +03:00
frontend_controller.ex	Add an API endpoint to install a new frontend	2020-10-27 19:20:21 +04:00
instance_document_controller.ex	changes after rebase	2020-10-13 16:44:03 +03:00
invite_controller.ex	alias alphabetically order	2020-10-13 16:43:59 +03:00
media_proxy_cache_controller.ex	alias alphabetically order	2020-10-13 16:43:59 +03:00
o_auth_app_controller.ex	alias alphabetically order	2020-10-13 16:43:59 +03:00
relay_controller.ex	alias alphabetically order	2020-10-13 16:43:59 +03:00
report_controller.ex	alias alphabetically order	2020-10-13 16:43:59 +03:00
status_controller.ex	alias alphabetically order	2020-10-13 16:43:59 +03:00
user_controller.ex	fix module name	2020-10-22 12:04:23 +03:00