diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-04-17 09:19:35 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-04-17 09:19:35 +0000 |
commit | a17bfb5fababbe25fa2abcfccd013c9f3edc2ef7 (patch) | |
tree | ca3e3f1fd04795615158e08821a024847078c55a /test/web/common_api/common_api_test.exs | |
parent | d8142ee6fee52529f610c58ba15a39b3e841cdc8 (diff) | |
parent | a6ee6784bc74b311d454112c427f41b1fdec6ce0 (diff) | |
download | pleroma-a17bfb5fababbe25fa2abcfccd013c9f3edc2ef7.tar.gz pleroma-a17bfb5fababbe25fa2abcfccd013c9f3edc2ef7.zip |
Merge branch 'feature/1584-client-captcha-options' into 'develop'
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
Diffstat (limited to 'test/web/common_api/common_api_test.exs')
0 files changed, 0 insertions, 0 deletions