Ivan Tashkinov 908cf22a6c Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/account_controller.ex		2020-04-28 19:56:20 +03:00
..
views	[#1706] Prevented error on unresolved activity actors for timeline actions.	2020-04-25 18:24:10 +03:00
admin_api_controller.ex	Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.	2020-04-21 16:29:19 +03:00
report.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
search.ex	Bump copyright years of files changed after 2020-01-07	2020-03-02 06:08:45 +01:00