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
..
controllers	Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks	4 years ago
views	Update Copyrights	5 years ago
twitter_api.ex	creating trusted app from adminFE & mix task	5 years ago
twitter_api_controller.ex	Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.	4 years ago