Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
Showing
- CHANGELOG.md 2 additions, 0 deletionsCHANGELOG.md
- config/config.exs 3 additions, 1 deletionconfig/config.exs
- config/prod.exs 2 additions, 2 deletionsconfig/prod.exs
- config/releases.exs 1 addition, 0 deletionsconfig/releases.exs
- config/test.exs 2 additions, 0 deletionsconfig/test.exs
- docs/API/pleroma_api.md 0 additions, 53 deletionsdocs/API/pleroma_api.md
- docs/administration/CLI_tasks/digest.md 2 additions, 1 deletiondocs/administration/CLI_tasks/digest.md
- docs/configuration/cheatsheet.md 4 additions, 0 deletionsdocs/configuration/cheatsheet.md
- docs/installation/centos7_en.md 0 additions, 274 deletionsdocs/installation/centos7_en.md
- docs/installation/migrating_from_source_otp_en.md 19 additions, 34 deletionsdocs/installation/migrating_from_source_otp_en.md
- docs/installation/otp_en.md 78 additions, 74 deletionsdocs/installation/otp_en.md
- lib/pleroma/application.ex 24 additions, 0 deletionslib/pleroma/application.ex
- lib/pleroma/html.ex 1 addition, 3 deletionslib/pleroma/html.ex
- lib/pleroma/object/fetcher.ex 1 addition, 1 deletionlib/pleroma/object/fetcher.ex
- lib/pleroma/utils.ex 12 additions, 0 deletionslib/pleroma/utils.ex
- lib/pleroma/web/activity_pub/activity_pub.ex 16 additions, 24 deletionslib/pleroma/web/activity_pub/activity_pub.ex
- lib/pleroma/web/activity_pub/activity_pub_controller.ex 3 additions, 3 deletionslib/pleroma/web/activity_pub/activity_pub_controller.ex
- lib/pleroma/web/activity_pub/mrf/drop_policy.ex 1 addition, 1 deletionlib/pleroma/web/activity_pub/mrf/drop_policy.ex
- lib/pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex 1 addition, 1 deletion...pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex
- lib/pleroma/web/activity_pub/publisher.ex 2 additions, 2 deletionslib/pleroma/web/activity_pub/publisher.ex
Loading
Please register or sign in to comment