pleroma

commit: 16cb9e5f1cae84322bd7953e58b438f3b4bd8b9c
parent: 17f7c5e290a2386f0e62f93d434146849a5e5d84
Author: lambda <lain@soykaf.club>
Date:   Mon, 13 May 2019 15:52:05 +0000

Merge branch 'mascot/pleroma-tan-shy' into 'develop'

pleroma-fox-tan-shy.png: Add another version of pleroma-tan

See merge request pleroma/pleroma!1139
Diffstat:
M
COPYING
8
++++++++
A
priv/static/images/pleroma-fox-tan-shy.png
0

2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/COPYING b/COPYING
@@ -15,6 +15,14 @@ priv/static/images/pleroma-tan.png
 
 ---
 
+The following files are copyright © 2019 shitposter.club, and are distributed
+under the Creative Commons Attribution 4.0 International license, you should
+have received a copy of the license file as CC-BY-4.0.
+
+priv/static/images/pleroma-fox-tan-shy.png
+
+---
+
 The following files are copyright © 2017-2019 Pleroma Authors
 <https://pleroma.social/>, and are distributed under the Creative Commons
 Attribution-ShareAlike 4.0 International license, you should have received
diff --git a/priv/static/images/pleroma-fox-tan-shy.png b/priv/static/images/pleroma-fox-tan-shy.png
Binary files differ.