lain d15aa9d950 Merge branch 'develop' into 'remove-twitter-api' ... # Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex		2020-05-16 17:07:09 +00:00
..
controllers	Merge branch 'develop' into 'remove-twitter-api'	2020-05-16 17:07:09 +00:00
views	Update Copyrights	2020-03-03 16:44:49 -06:00
twitter_api.ex	Add tests for account registration with captcha enabled and improve errors	2020-04-29 21:26:07 +04:00
twitter_api_controller.ex	[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.	2020-04-24 16:52:38 +03:00