From: lambda Date: Mon, 13 May 2019 15:52:05 +0000 (+0000) Subject: Merge branch 'mascot/pleroma-tan-shy' into 'develop' X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=16cb9e5f1cae84322bd7953e58b438f3b4bd8b9c;hp=17f7c5e290a2386f0e62f93d434146849a5e5d84;p=akkoma 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 --- diff --git a/COPYING b/COPYING index eceb68efe..0aede0fba 100644 --- 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 , 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 new file mode 100644 index 000000000..6e24be1e3 Binary files /dev/null and b/priv/static/images/pleroma-fox-tan-shy.png differ