lain c4d3ccc7b9 Merge branch 'admin-api-change-password' into 'develop' ... Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials` See merge request pleroma/pleroma!2149		2020-03-31 13:41:47 +03:00
..
controllers	Merge branch 'admin-api-change-password' into 'develop'	2020-03-31 13:41:47 +03:00
views	Merge branch 'features/staticfe-sanitization' into 'develop'	2020-03-16 00:14:04 +03: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