-
- Downloads
Merge branch 'develop' into 'akoma/deactivated-users'
# Conflicts: # CHANGELOG.md
Showing
- CHANGELOG.md 2 additions, 0 deletionsCHANGELOG.md
- lib/pleroma/object/fetcher.ex 5 additions, 0 deletionslib/pleroma/object/fetcher.ex
- lib/pleroma/web/activity_pub/side_effects.ex 0 additions, 2 deletionslib/pleroma/web/activity_pub/side_effects.ex
- lib/pleroma/web/federator.ex 7 additions, 2 deletionslib/pleroma/web/federator.ex
- lib/pleroma/web/plugs/http_security_plug.ex 1 addition, 1 deletionlib/pleroma/web/plugs/http_security_plug.ex
- priv/gettext/uk/LC_MESSAGES/config_descriptions.po 6071 additions, 0 deletionspriv/gettext/uk/LC_MESSAGES/config_descriptions.po
- priv/gettext/uk/LC_MESSAGES/default.po 197 additions, 0 deletionspriv/gettext/uk/LC_MESSAGES/default.po
- priv/gettext/uk/LC_MESSAGES/errors.po 8 additions, 8 deletionspriv/gettext/uk/LC_MESSAGES/errors.po
- test/pleroma/object/fetcher_test.exs 12 additions, 0 deletionstest/pleroma/object/fetcher_test.exs
- test/pleroma/web/plugs/http_security_plug_test.exs 2 additions, 2 deletionstest/pleroma/web/plugs/http_security_plug_test.exs
- test/pleroma/workers/publisher_worker_test.exs 40 additions, 0 deletionstest/pleroma/workers/publisher_worker_test.exs
Loading
Please register or sign in to comment