minibikini 6163fbf553 Merge branch 'develop' into 'frontend-admin-api' ... # Conflicts: # lib/pleroma/web/router.ex		2020-11-02 10:43:45 +00:00
..
account_view.ex	Fixed User.is_discoverable attribute rendering in Admin API User view.	2020-10-28 22:29:52 +03:00
chat_view.ex	Chat Moderation: use explicit sender and recipient fields	2020-09-11 14:11:00 -05:00
config_view.ex	Mogrify args as custom tuples	2020-06-16 15:53:28 +03:00
frontend_view.ex	Add an API endpoint to install a new frontend	2020-10-27 19:20:21 +04:00
invite_view.ex	Add AdminAPI.InviteView	2020-05-26 15:21:33 +04:00
media_proxy_cache_view.ex	added paginate+search for admin/MediaProxy URLs	2020-08-11 10:30:13 +03:00
moderation_log_view.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
report_view.ex	Fix rendering of reports	2020-10-07 12:30:55 -05:00
status_view.ex	MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1	2020-09-11 14:09:50 -05:00