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 'feature/1952-read-muted-notifications' into 'develop'	2020-08-25 21:32:32 +00:00
mastodon_api_controller_test.exs	[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.	2020-04-24 16:52:38 +03:00
mastodon_api_test.exs	MastodonAPITest: Do the needful	2020-08-04 15:08:51 +02:00