diff options
author | lambda <pleromagit@rogerbraun.net> | 2019-02-01 14:24:07 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2019-02-01 14:24:07 +0000 |
commit | fc7644798d72a6b8c99fb05196ec9143d00e9ef4 (patch) | |
tree | c0cd390c592e09da8419b004472d4ed63c40a5ae /lib | |
parent | ddab8d45ec48be823846bae4cbe2d32f627e0e59 (diff) | |
parent | fa5ec765d9c6184027ba1e4371e9a6f863c3f5db (diff) | |
download | pleroma-fc7644798d72a6b8c99fb05196ec9143d00e9ef4.tar.gz |
Merge branch 'serve-sw-pleroma.js' into 'develop'
Serve sw-pleroma.js properly
See merge request pleroma/pleroma!754
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/plugs/instance_static.ex | 2 | ||||
-rw-r--r-- | lib/pleroma/web/endpoint.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/plugs/instance_static.ex b/lib/pleroma/plugs/instance_static.ex index af2f6f331..11f108de7 100644 --- a/lib/pleroma/plugs/instance_static.ex +++ b/lib/pleroma/plugs/instance_static.ex @@ -21,7 +21,7 @@ defmodule Pleroma.Plugs.InstanceStatic do end end - @only ~w(index.html static emoji packs sounds images instance favicon.png) + @only ~w(index.html static emoji packs sounds images instance favicon.png sw.js sw-pleroma.js) def init(opts) do opts diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index 0b4ce9cc4..2b156fdfd 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -25,7 +25,7 @@ defmodule Pleroma.Web.Endpoint do at: "/", from: :pleroma, only: - ~w(index.html static finmoji emoji packs sounds images instance sw.js favicon.png schemas doc) + ~w(index.html static finmoji emoji packs sounds images instance sw.js sw-pleroma.js favicon.png schemas doc) ) # Code reloading can be explicitly enabled under the |