summaryrefslogtreecommitdiff
path: root/priv
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-11-04 13:23:18 +0100
committerlain <lain@soykaf.club>2020-11-04 13:23:18 +0100
commite46c95b826c3fb98efa15cf6fd5d6cf2fb9797af (patch)
tree5eac134f31a610d4a1a87003c3ac0728ded42bc0 /priv
parent6163fbf55328808d90bb1a84cf05ae986f941b31 (diff)
parentba3f3a5a56d4a5ac05443fd30b5864778ad1131e (diff)
downloadpleroma-e46c95b826c3fb98efa15cf6fd5d6cf2fb9797af.tar.gz
pleroma-e46c95b826c3fb98efa15cf6fd5d6cf2fb9797af.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
Diffstat (limited to 'priv')
-rw-r--r--priv/static/favicon.pngbin1603 -> 1583 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/priv/static/favicon.png b/priv/static/favicon.png
index a96d5d252..098040a00 100644
--- a/priv/static/favicon.png
+++ b/priv/static/favicon.png
Binary files differ