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	Merge branch 'email-stub-in-verify-credentials' into 'develop'	2021-02-02 18:35:08 +00:00
mastodon_api.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
websocket_handler.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00