moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflict

This commit is contained in:
KANEKO Yoshitaka 2018-04-01 16:58:35 +09:00
parent 5fa8237bc1 ee2503df3a
commit b3d67750f0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/endpoint.ex
View File

@ -17,7 +17,7 @@ defmodule Pleroma.Web.Endpoint do
Plug.Static, Plug.Static,
at: "/", at: "/",
from: :pleroma, 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 # Code reloading can be explicitly enabled under the