-
- Downloads
Merge branch 'develop' into 'domain-block-precedence'
# Conflicts: # lib/pleroma/user.ex
Showing
- .formatter.exs 1 addition, 1 deletion.formatter.exs
- .gitlab-ci.yml 14 additions, 0 deletions.gitlab-ci.yml
- CHANGELOG.md 15 additions, 0 deletionsCHANGELOG.md
- benchmarks/load_testing/fetcher.ex 30 additions, 1 deletionbenchmarks/load_testing/fetcher.ex
- benchmarks/load_testing/generator.ex 18 additions, 1 deletionbenchmarks/load_testing/generator.ex
- benchmarks/mix/tasks/pleroma/load_testing.ex 4 additions, 0 deletionsbenchmarks/mix/tasks/pleroma/load_testing.ex
- config/config.exs 5 additions, 1 deletionconfig/config.exs
- config/description.exs 9 additions, 0 deletionsconfig/description.exs
- docs/API/admin_api.md 7 additions, 0 deletionsdocs/API/admin_api.md
- docs/API/differences_in_mastoapi_responses.md 13 additions, 0 deletionsdocs/API/differences_in_mastoapi_responses.md
- docs/API/pleroma_api.md 1 addition, 0 deletionsdocs/API/pleroma_api.md
- docs/administration/CLI_tasks/config.md 15 additions, 6 deletionsdocs/administration/CLI_tasks/config.md
- docs/administration/CLI_tasks/database.md 33 additions, 13 deletionsdocs/administration/CLI_tasks/database.md
- docs/administration/CLI_tasks/digest.md 16 additions, 5 deletionsdocs/administration/CLI_tasks/digest.md
- docs/administration/CLI_tasks/emoji.md 23 additions, 7 deletionsdocs/administration/CLI_tasks/emoji.md
- docs/administration/CLI_tasks/general_cli_task_info.include 5 additions, 0 deletionsdocs/administration/CLI_tasks/general_cli_task_info.include
- docs/administration/CLI_tasks/instance.md 8 additions, 3 deletionsdocs/administration/CLI_tasks/instance.md
- docs/administration/CLI_tasks/relay.md 16 additions, 13 deletionsdocs/administration/CLI_tasks/relay.md
- docs/administration/CLI_tasks/uploads.md 8 additions, 3 deletionsdocs/administration/CLI_tasks/uploads.md
- docs/administration/CLI_tasks/user.md 114 additions, 33 deletionsdocs/administration/CLI_tasks/user.md
Loading
Please register or sign in to comment