feld f1f773f2c7 Merge branch 'email-stub-in-verify-credentials' into 'develop' ... Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike) See merge request pleroma/pleroma!3286		2021-02-02 18:35:08 +00:00
..
controllers	Merge branch 'develop' into 'fix/2411-mutes-api'	2021-02-02 17:57:58 +00:00
views	Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).	2021-01-28 19:49:43 +03:00
masto_fe_controller_test.exs	Convert tests to all use clear_config instead of Pleroma.Config.put	2021-01-26 11:58:43 -06:00
mastodon_api_controller_test.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
mastodon_api_test.exs	Change user.deactivated field to user.is_active	2021-01-15 11:24:46 -06:00
update_credentials_test.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00