summaryrefslogtreecommitdiff
path: root/priv/static
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-11-04 16:18:11 +0100
committerlain <lain@soykaf.club>2020-11-04 16:18:11 +0100
commitbae48c98e32af6c43fa668771c6253f299d4bf8a (patch)
tree0ceb2b31a2c65af23039e4074c51c495dd7dd8f8 /priv/static
parent04b7505c75afbaa1f785b2adaf0313e9b0935fab (diff)
parent4800ee656bbcd8fe21fe56531123d3a18eccc911 (diff)
downloadpleroma-bae48c98e32af6c43fa668771c6253f299d4bf8a.tar.gz
pleroma-bae48c98e32af6c43fa668771c6253f299d4bf8a.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
Diffstat (limited to 'priv/static')
-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