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.ex	Update Copyrights	5 years ago
remote_follow_controller.ex	[#1560] Restricted AP- & OStatus-related routes for non-federating instances.	5 years ago
util_controller.ex	Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks	4 years ago