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 0062116e07 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
..
password_controller_test.exs	Bump copyright years of files changed after 2020-01-07	5 years ago
remote_follow_controller_test.exs	Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).	5 years ago
twitter_api_controller_test.exs	Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.	4 years ago
twitter_api_test.exs	formatter.ex: Use Phoenix.HTML for mention/hashtag generation	5 years ago
util_controller_test.exs	Fix Oban warning	4 years ago