-
- Downloads
Merge branch 'develop' into 'feature/relay'
# Conflicts: # lib/pleroma/web/activity_pub/utils.ex
No related branches found
No related tags found
Showing
- config/config.exs 11 additions, 5 deletionsconfig/config.exs
- installation/caddyfile-pleroma.example 33 additions, 5 deletionsinstallation/caddyfile-pleroma.example
- installation/init.d/pleroma 21 additions, 0 deletionsinstallation/init.d/pleroma
- lib/mix/tasks/generate_invite_token.ex 25 additions, 0 deletionslib/mix/tasks/generate_invite_token.ex
- lib/pleroma/formatter.ex 35 additions, 7 deletionslib/pleroma/formatter.ex
- lib/pleroma/gopher/server.ex 3 additions, 3 deletionslib/pleroma/gopher/server.ex
- lib/pleroma/http/http.ex 24 additions, 1 deletionlib/pleroma/http/http.ex
- lib/pleroma/upload.ex 13 additions, 13 deletionslib/pleroma/upload.ex
- lib/pleroma/user.ex 1 addition, 0 deletionslib/pleroma/user.ex
- lib/pleroma/user_invite_token.ex 40 additions, 0 deletionslib/pleroma/user_invite_token.ex
- lib/pleroma/web/activity_pub/activity_pub.ex 1 addition, 1 deletionlib/pleroma/web/activity_pub/activity_pub.ex
- lib/pleroma/web/activity_pub/transmogrifier.ex 56 additions, 7 deletionslib/pleroma/web/activity_pub/transmogrifier.ex
- lib/pleroma/web/activity_pub/utils.ex 15 additions, 5 deletionslib/pleroma/web/activity_pub/utils.ex
- lib/pleroma/web/activity_pub/views/user_view.ex 2 additions, 7 deletionslib/pleroma/web/activity_pub/views/user_view.ex
- lib/pleroma/web/common_api/utils.ex 2 additions, 3 deletionslib/pleroma/web/common_api/utils.ex
- lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 53 additions, 15 deletionslib/pleroma/web/mastodon_api/mastodon_api_controller.ex
- lib/pleroma/web/mastodon_api/views/account_view.ex 14 additions, 2 deletionslib/pleroma/web/mastodon_api/views/account_view.ex
- lib/pleroma/web/mastodon_api/views/status_view.ex 19 additions, 3 deletionslib/pleroma/web/mastodon_api/views/status_view.ex
- lib/pleroma/web/nodeinfo/nodeinfo_controller.ex 8 additions, 1 deletionlib/pleroma/web/nodeinfo/nodeinfo_controller.ex
- lib/pleroma/web/router.ex 8 additions, 3 deletionslib/pleroma/web/router.ex
Loading
Please register or sign in to comment