-
- Downloads
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts: # lib/mix/tasks/sample_config.eex # lib/pleroma/web/twitter_api/controllers/util_controller.ex # mix.exs # mix.lock
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 6 additions, 1 deletion.gitlab-ci.yml
- CONFIGURATION.md 0 additions, 106 deletionsCONFIGURATION.md
- README.md 12 additions, 21 deletionsREADME.md
- config/config.exs 62 additions, 13 deletionsconfig/config.exs
- config/config.md 102 additions, 0 deletionsconfig/config.md
- installation/caddyfile-pleroma.example 8 additions, 24 deletionsinstallation/caddyfile-pleroma.example
- installation/pleroma-apache.conf 20 additions, 22 deletionsinstallation/pleroma-apache.conf
- installation/pleroma.nginx 2 additions, 24 deletionsinstallation/pleroma.nginx
- installation/pleroma.service 11 additions, 0 deletionsinstallation/pleroma.service
- installation/pleroma.vcl 0 additions, 10 deletionsinstallation/pleroma.vcl
- lib/mix/tasks/deactivate_user.ex 7 additions, 1 deletionlib/mix/tasks/deactivate_user.ex
- lib/mix/tasks/generate_config.ex 9 additions, 1 deletionlib/mix/tasks/generate_config.ex
- lib/mix/tasks/generate_invite_token.ex 8 additions, 1 deletionlib/mix/tasks/generate_invite_token.ex
- lib/mix/tasks/generate_password_reset.ex 7 additions, 1 deletionlib/mix/tasks/generate_password_reset.ex
- lib/mix/tasks/make_moderator.ex 8 additions, 1 deletionlib/mix/tasks/make_moderator.ex
- lib/mix/tasks/reactivate_user.ex 19 additions, 0 deletionslib/mix/tasks/reactivate_user.ex
- lib/mix/tasks/register_user.ex 8 additions, 0 deletionslib/mix/tasks/register_user.ex
- lib/mix/tasks/relay_follow.ex 13 additions, 4 deletionslib/mix/tasks/relay_follow.ex
- lib/mix/tasks/relay_unfollow.ex 13 additions, 5 deletionslib/mix/tasks/relay_unfollow.ex
- lib/mix/tasks/rm_user.ex 8 additions, 2 deletionslib/mix/tasks/rm_user.ex
Loading
Please register or sign in to comment