Haelwenn 87fe31fb5c Merge branch '1993-confirm-users-on-registration' into 'develop' ... AccountController: Don't explicitly ask to keep users unconfirmed. Closes #1993 See merge request pleroma/pleroma!2809		2020-07-30 20:01:04 +00:00
..
controllers	Merge branch '1993-confirm-users-on-registration' into 'develop'	2020-07-30 20:01:04 +00:00
views	Merge remote-tracking branch 'upstream/develop' into by-approval	2020-07-26 15:46:14 -05:00
mastodon_api.ex
websocket_handler.ex