summaryrefslogtreecommitdiff
path: root/priv/static
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-11-04 15:38:10 +0100
committerlain <lain@soykaf.club>2020-11-04 15:38:10 +0100
commit504a829edb821f24fe7138380e77533cc9f802e6 (patch)
treed63c3a26e31ec608274becc2e53d0894151b4fe8 /priv/static
parent2ca98f2d94e2976ae35998aecff27809d4b066cf (diff)
parentbc4d9c4ffc9ccd826220893a97ce695e4bb66f9d (diff)
downloadpleroma-504a829edb821f24fe7138380e77533cc9f802e6.tar.gz
pleroma-504a829edb821f24fe7138380e77533cc9f802e6.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
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