Merge branch 'feature/1584-client-captcha-options' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 17 Apr 2020 09:19:35 +0000 (09:19 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 17 Apr 2020 09:19:35 +0000 (09:19 +0000)
commita17bfb5fababbe25fa2abcfccd013c9f3edc2ef7
treeca3e3f1fd04795615158e08821a024847078c55a
parentd8142ee6fee52529f610c58ba15a39b3e841cdc8
parenta6ee6784bc74b311d454112c427f41b1fdec6ce0
Merge branch 'feature/1584-client-captcha-options' into 'develop'

Creating trusted app from adminFE & mix task

Closes #1584

See merge request pleroma/pleroma!2252
CHANGELOG.md
docs/API/admin_api.md
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/router.ex
test/web/admin_api/admin_api_controller_test.exs
test/web/mastodon_api/controllers/account_controller_test.exs