-
- Downloads
Merge branch 'develop' into merge/develop-20210106
Showing
- .gitattributes 8 additions, 0 deletions.gitattributes
- .gitignore 1 addition, 0 deletions.gitignore
- .gitlab-ci.yml 7 additions, 8 deletions.gitlab-ci.yml
- CHANGELOG.md 112 additions, 14 deletionsCHANGELOG.md
- Dockerfile 3 additions, 3 deletionsDockerfile
- SECURITY.md 1 addition, 1 deletionSECURITY.md
- benchmarks/load_testing/users.ex 2 additions, 2 deletionsbenchmarks/load_testing/users.ex
- benchmarks/mix/tasks/pleroma/benchmarks/timelines.ex 1 addition, 1 deletionbenchmarks/mix/tasks/pleroma/benchmarks/timelines.ex
- config/config.exs 15 additions, 19 deletionsconfig/config.exs
- config/description.exs 48 additions, 471 deletionsconfig/description.exs
- config/emoji.txt 1 addition, 0 deletionsconfig/emoji.txt
- config/releases.exs 0 additions, 31 deletionsconfig/releases.exs
- config/test.exs 18 additions, 6 deletionsconfig/test.exs
- docs/API/admin_api.md 65 additions, 1 deletiondocs/API/admin_api.md
- docs/API/chats.md 8 additions, 1 deletiondocs/API/chats.md
- docs/API/differences_in_mastoapi_responses.md 67 additions, 11 deletionsdocs/API/differences_in_mastoapi_responses.md
- docs/API/pleroma_api.md 40 additions, 2 deletionsdocs/API/pleroma_api.md
- docs/administration/CLI_tasks/config.md 109 additions, 1 deletiondocs/administration/CLI_tasks/config.md
- docs/administration/CLI_tasks/email.md 3 additions, 4 deletionsdocs/administration/CLI_tasks/email.md
- docs/administration/CLI_tasks/release_environments.md 0 additions, 9 deletionsdocs/administration/CLI_tasks/release_environments.md
Loading
Please register or sign in to comment