Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
16cb9e5f
Commit
16cb9e5f
authored
May 13, 2019
by
lain
Browse files
Merge branch 'mascot/pleroma-tan-shy' into 'develop'
pleroma-fox-tan-shy.png: Add another version of pleroma-tan See merge request
!1139
parents
17f7c5e2
566a968a
Pipeline
#11709
passed with stages
in 4 minutes and 35 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
COPYING
View file @
16cb9e5f
...
@@ -15,6 +15,14 @@ priv/static/images/pleroma-tan.png
...
@@ -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
The following files are copyright © 2017-2019 Pleroma Authors
<https://pleroma.social/>, and are distributed under the Creative Commons
<https://pleroma.social/>, and are distributed under the Creative Commons
Attribution-ShareAlike 4.0 International license, you should have received
Attribution-ShareAlike 4.0 International license, you should have received
...
...
priv/static/images/pleroma-fox-tan-shy.png
0 → 100644
View file @
16cb9e5f
1010 KB
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment