diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-05-14 18:15:56 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-05-14 18:15:56 +0700 |
| commit | 5e2b491276d5cd8d90fddf219f7653d1c9b31ef3 (patch) | |
| tree | c7d10c01a9b17ba9c732cb43e2097bd26d67e915 /COPYING | |
| parent | 1557b99beb3b406572ef2d3baaabed1c9baeca1c (diff) | |
| parent | cdcdbd88da76f18c21da7f6f15a29883044902c8 (diff) | |
| download | pleroma-5e2b491276d5cd8d90fddf219f7653d1c9b31ef3.tar.gz pleroma-5e2b491276d5cd8d90fddf219f7653d1c9b31ef3.zip | |
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
Diffstat (limited to 'COPYING')
| -rw-r--r-- | COPYING | 8 |
1 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 |