Haelwenn a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop' ... Creating trusted app from adminFE & mix task Closes #1584 See merge request pleroma/pleroma!2252		2020-04-17 09:19:35 +00:00
..
controllers	Merge branch 'feature/1584-client-captcha-options' into 'develop'	2020-04-17 09:19:35 +00:00
views	Merge branch 'feature/1584-client-captcha-options' into 'develop'	2020-04-17 09:19:35 +00:00
mastodon_api.ex	include_types parameter in /api/v1/notifications	2020-03-20 13:18:12 +03:00
websocket_handler.ex	Update Copyrights	2020-03-03 16:44:49 -06:00