diff options
| author | lambda <lain@soykaf.club> | 2019-05-13 15:52:05 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-05-13 15:52:05 +0000 |
| commit | 16cb9e5f1cae84322bd7953e58b438f3b4bd8b9c (patch) | |
| tree | 84df44fb14ac2839f9c995287d68a84e4c6fe119 | |
| parent | 17f7c5e290a2386f0e62f93d434146849a5e5d84 (diff) | |
| parent | 566a968ab35562aeccd2ec3b13a4d70de37968d6 (diff) | |
| download | pleroma-16cb9e5f1cae84322bd7953e58b438f3b4bd8b9c.tar.gz | |
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
| -rw-r--r-- | COPYING | 8 | ||||
| -rw-r--r-- | priv/static/images/pleroma-fox-tan-shy.png | bin | 0 -> 1038613 bytes |
2 files changed, 8 insertions, 0 deletions
@@ -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 differnew file mode 100644 index 000000000..6e24be1e3 --- /dev/null +++ b/priv/static/images/pleroma-fox-tan-shy.png |
