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
..
password_controller.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
remote_follow_controller.ex	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	2020-05-07 08:14:54 +00:00
util_controller.ex	Merge branch 'develop' into 'remove-twitter-api'	2020-05-16 17:07:09 +00:00