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
..
controllers	Move single used schemas to operation schema	4 years ago
views	Polls: Persist and show voters' count	4 years ago
mastodon_api_controller_test.exs	[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.	4 years ago
mastodon_api_test.exs	Update Copyrights	5 years ago