feld 2019f3b3ff Merge branch 'fix/signup-without-email' into 'develop' ... Allow account registration without an email See merge request pleroma/pleroma!2246		2020-03-11 16:53:05 +00:00
..
controllers	Merge branch 'fix/signup-without-email' into 'develop'	2020-03-11 16:53:05 +00:00
views	Update Copyrights	2020-03-03 16:44:49 -06:00
mastodon_api.ex	Bump copyright years of files changed after 2020-01-07	2020-03-02 06:08:45 +01:00
websocket_handler.ex	Update Copyrights	2020-03-03 16:44:49 -06:00