feld 43b07c31cb Merge branch 'fix/2095-deactivated-account-reset' into 'develop' ... Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935		2020-09-08 13:53:47 +03:00
..
controllers	Merge branch 'fix/2095-deactivated-account-reset' into 'develop'	2020-09-08 13:53:47 +03:00
views	Merge branch 'feat/rich-media-improvements' into 'develop'	2020-09-08 13:00:49 +03:00
mastodon_api.ex	…
websocket_handler.ex	…