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	Revert "Merge branch 'issue/1276' into 'develop'"	2020-04-14 16:32:22 +00:00
mastodon_api_controller_test.exs	Bump copyright years of files changed after 2020-01-07	2020-03-02 06:08:45 +01:00
mastodon_api_test.exs	Update Copyrights	2020-03-03 16:44:49 -06:00