Merge branch 'develop' into pleroma-ur-gs-changes
Showing
- .credo.exs 4 additions, 3 deletions.credo.exs
- .gitignore 1 addition, 0 deletions.gitignore
- .gitlab-ci.yml 3 additions, 2 deletions.gitlab-ci.yml
- README.md 29 additions, 37 deletionsREADME.md
- config/config.exs 85 additions, 7 deletionsconfig/config.exs
- config/dev.exs 2 additions, 1 deletionconfig/dev.exs
- config/test.exs 3 additions, 0 deletionsconfig/test.exs
- docs/Admin-API.md 8 additions, 0 deletionsdocs/Admin-API.md
- docs/Clients.md 100 additions, 0 deletionsdocs/Clients.md
- docs/Differences-in-MastodonAPI-Responses.md 11 additions, 0 deletionsdocs/Differences-in-MastodonAPI-Responses.md
- docs/Pleroma-API.md 17 additions, 5 deletionsdocs/Pleroma-API.md
- docs/config.md 127 additions, 11 deletionsdocs/config.md
- installation/caddyfile-pleroma.example 5 additions, 0 deletionsinstallation/caddyfile-pleroma.example
- installation/init.d/pleroma 3 additions, 3 deletionsinstallation/init.d/pleroma
- installation/pleroma-apache.conf 18 additions, 0 deletionsinstallation/pleroma-apache.conf
- installation/pleroma.nginx 13 additions, 7 deletionsinstallation/pleroma.nginx
- installation/pleroma.service 15 additions, 5 deletionsinstallation/pleroma.service
- lib/mix/tasks/pleroma/instance.ex 2 additions, 0 deletionslib/mix/tasks/pleroma/instance.ex
- lib/mix/tasks/pleroma/sample_config.eex 2 additions, 1 deletionlib/mix/tasks/pleroma/sample_config.eex
- lib/mix/tasks/pleroma/uploads.ex 4 additions, 2 deletionslib/mix/tasks/pleroma/uploads.ex
Loading
Please register or sign in to comment