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
..
controllers	Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks	2020-04-22 18:51:59 +03:00
views	Update Copyrights	2020-03-03 16:44:49 -06:00
twitter_api.ex	creating trusted app from adminFE & mix task	2020-03-23 10:44:47 +03:00
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.	2020-04-22 18:50:25 +03:00