-
- Downloads
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts: # lib/pleroma/web/federator/federator.ex # lib/pleroma/web/websub/websub.ex
No related branches found
No related tags found
Showing
- .credo.exs 3 additions, 2 deletions.credo.exs
- README.md 1 addition, 14 deletionsREADME.md
- config/config.exs 6 additions, 1 deletionconfig/config.exs
- docs/Clients.md 87 additions, 0 deletionsdocs/Clients.md
- docs/config.md 25 additions, 0 deletionsdocs/config.md
- installation/caddyfile-pleroma.example 5 additions, 0 deletionsinstallation/caddyfile-pleroma.example
- installation/init.d/pleroma 2 additions, 2 deletionsinstallation/init.d/pleroma
- installation/pleroma.nginx 5 additions, 4 deletionsinstallation/pleroma.nginx
- installation/pleroma.service 4 additions, 2 deletionsinstallation/pleroma.service
- lib/mix/tasks/pleroma/uploads.ex 4 additions, 2 deletionslib/mix/tasks/pleroma/uploads.ex
- lib/mix/tasks/pleroma/user.ex 3 additions, 2 deletionslib/mix/tasks/pleroma/user.ex
- lib/pleroma/PasswordResetToken.ex 3 additions, 1 deletionlib/pleroma/PasswordResetToken.ex
- lib/pleroma/activity.ex 5 additions, 1 deletionlib/pleroma/activity.ex
- lib/pleroma/captcha/captcha.ex 1 addition, 1 deletionlib/pleroma/captcha/captcha.ex
- lib/pleroma/emails/user_email.ex 2 additions, 1 deletionlib/pleroma/emails/user_email.ex
- lib/pleroma/filter.ex 6 additions, 2 deletionslib/pleroma/filter.ex
- lib/pleroma/flake_id.ex 2 additions, 2 deletionslib/pleroma/flake_id.ex
- lib/pleroma/formatter.ex 2 additions, 2 deletionslib/pleroma/formatter.ex
- lib/pleroma/gopher/server.ex 3 additions, 3 deletionslib/pleroma/gopher/server.ex
- lib/pleroma/html.ex 4 additions, 4 deletionslib/pleroma/html.ex
Loading
Please register or sign in to comment