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		2020-04-22 18:51:59 +03:00
..
password_controller_test.exs	Bump copyright years of files changed after 2020-01-07	2020-03-02 06:08:45 +01:00
remote_follow_controller_test.exs	Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).	2020-03-20 18:33:00 +03:00
twitter_api_controller_test.exs	Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.	2020-04-21 16:29:19 +03:00
twitter_api_test.exs	formatter.ex: Use Phoenix.HTML for mention/hashtag generation	2020-04-08 22:58:31 +03:00
util_controller_test.exs	Fix Oban warning	2020-04-22 19:27:28 +04:00