Merge branch 'develop' into 'fix/2412-filters'

# Conflicts: # CHANGELOG.md
2021-02-03 14:23:23 +00:00 · 2021-02-03 14:23:23 +00:00 · 008499f65a
commit 008499f65a
parent 39335d4251 c3dd860a02
245 changed files with 1917 additions and 905 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -726,7 +726,10 @@ config :pleroma, :frontends,
      "git" => "https://git.pleroma.social/pleroma/fedi-fe",
      "build_url" =>
        "https://git.pleroma.social/pleroma/fedi-fe/-/jobs/artifacts/${ref}/download?job=build",
-      "ref" => "master"
+      "ref" => "master",
+      "custom-http-headers" => [
+        {"service-worker-allowed", "/"}
+      ]
    },
    "admin-fe" => %{
      "name" => "admin-fe",