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
mastodon_api_controller_test.exs
mastodon_api_test.exs