-
- Downloads
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
Showing
- .credo.exs 5 additions, 7 deletions.credo.exs
- .gitlab-ci.yml 7 additions, 1 deletion.gitlab-ci.yml
- TODO.txt 0 additions, 12 deletionsTODO.txt
- config/config.exs 15 additions, 1 deletionconfig/config.exs
- config/test.exs 2 additions, 0 deletionsconfig/test.exs
- docs/Admin-API.md 5 additions, 30 deletionsdocs/Admin-API.md
- docs/Clients.md 10 additions, 10 deletionsdocs/Clients.md
- docs/Differences-in-MastodonAPI-Responses.md 10 additions, 0 deletionsdocs/Differences-in-MastodonAPI-Responses.md
- docs/config.md 5 additions, 1 deletiondocs/config.md
- lib/mix/tasks/pleroma/relay.ex 1 addition, 1 deletionlib/mix/tasks/pleroma/relay.ex
- lib/mix/tasks/pleroma/uploads.ex 1 addition, 2 deletionslib/mix/tasks/pleroma/uploads.ex
- lib/mix/tasks/pleroma/user.ex 1 addition, 1 deletionlib/mix/tasks/pleroma/user.ex
- lib/pleroma/PasswordResetToken.ex 2 additions, 2 deletionslib/pleroma/PasswordResetToken.ex
- lib/pleroma/activity.ex 13 additions, 1 deletionlib/pleroma/activity.ex
- lib/pleroma/application.ex 10 additions, 10 deletionslib/pleroma/application.ex
- lib/pleroma/captcha/captcha.ex 3 additions, 3 deletionslib/pleroma/captcha/captcha.ex
- lib/pleroma/captcha/kocaptcha.ex 1 addition, 1 deletionlib/pleroma/captcha/kocaptcha.ex
- lib/pleroma/clippy.ex 4 additions, 4 deletionslib/pleroma/clippy.ex
- lib/pleroma/config/deprecation_warnings.ex 1 addition, 1 deletionlib/pleroma/config/deprecation_warnings.ex
- lib/pleroma/emoji.ex 4 additions, 4 deletionslib/pleroma/emoji.ex
Loading
Please register or sign in to comment