Ivan Tashkinov 0e27c274f4 Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements ... # Conflicts: # test/web/mastodon_api/controllers/account_controller_test.exs		2020-03-20 18:08:23 +03:00
..
controllers	Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements	2020-03-20 18:08:23 +03:00
views	removing with_move parameter	2020-03-16 20:07:45 +03:00
mastodon_api_controller_test.exs	Bump copyright years of files changed after 2020-01-07	2020-03-02 06:08:45 +01:00
mastodon_api_test.exs	Update Copyrights	2020-03-03 16:44:49 -06:00