Fix conflict

2018-04-01 16:58:35 +09:00 · 2018-04-01 16:58:35 +09:00 · b3d67750f0
commit b3d67750f0
parent 5fa8237bc1 ee2503df3a
1 changed files with 1 additions and 1 deletions
--- 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