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
2019-05-13 15:52:05 +00:00 · 2019-05-13 15:52:05 +00:00 · 16cb9e5f1c
parent 17f7c5e290 566a968ab3
commit 16cb9e5f1c
2 changed files with 8 additions and 0 deletions
--- a/8
+++ b/8
@ -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
--- a/priv/static/images/pleroma-fox-tan-shy.png
+++ b/priv/static/images/pleroma-fox-tan-shy.png