You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		4 years ago
..
views	[#1706] Prevented error on unresolved activity actors for timeline actions.	4 years ago
admin_api_controller.ex	Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.	4 years ago
report.ex	Update Copyrights	5 years ago
search.ex	Bump copyright years of files changed after 2020-01-07	5 years ago