diff options
| author | KANEKO Yoshitaka <info@mevo.xyz> | 2018-04-01 16:58:35 +0900 |
|---|---|---|
| committer | KANEKO Yoshitaka <info@mevo.xyz> | 2018-04-01 16:58:35 +0900 |
| commit | b3d67750f04d7c72c3e1deeb6df573cbb195146a (patch) | |
| tree | f29550c94667306a66f714f0beb6a338a424b7f9 | |
| parent | 5fa8237bc1dcabca050dc5d8d9325fec649e1723 (diff) | |
| parent | ee2503df3ab00a0e8407f0e3eec94da8fd3235bb (diff) | |
| download | pleroma-b3d67750f04d7c72c3e1deeb6df573cbb195146a.tar.gz | |
Fix conflict
| -rw-r--r-- | lib/pleroma/web/endpoint.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index 0a2ac853e..fdf7fb72a 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -17,7 +17,7 @@ defmodule Pleroma.Web.Endpoint do Plug.Static, at: "/", from: :pleroma, - only: ~w(index.html static finmoji emoji packs sounds images instance sw.js) + only: ~w(index.html static finmoji emoji packs sounds images instance sw.js favicon.png) ) # Code reloading can be explicitly enabled under the |