Merge pull request 'Update copyright info' (#285) from norm/akkoma:copyright-stuff into develop

Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/285
This commit is contained in:
floatingghost 2022-11-18 11:17:24 +00:00
commit ab44b82af0

19
COPYING
View file

@ -1,12 +1,15 @@
Unless otherwise stated this repository is copyright © 2017-2021 Unless otherwise stated this repository is
Pleroma Authors <https://pleroma.social/>, and is distributed under Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
The GNU Affero General Public License Version 3, you should have received a Copyright © 2022 Akkoma Authors <https://akkoma.social/>
copy of the license file as AGPL-3. and is distributed under The GNU Affero General Public License Version 3, you
should have received a copy of the license file as AGPL-3.
--- ---
Files inside docs directory are copyright © 2021 Pleroma Authors Files inside docs directory are
<https://pleroma.social/>, and are distributed under the Creative Commons Copyright © 2021-2022 Pleroma Authors <https://pleroma.social/>
Copyright © 2022 Akkoma Authors <https://akkoma.social/>
and are distributed under the Creative Commons
Attribution 4.0 International license, you should have received Attribution 4.0 International license, you should have received
a copy of the license file as CC-BY-4.0. a copy of the license file as CC-BY-4.0.
@ -16,9 +19,7 @@ The following files are copyright © 2019 shitposter.club, and are distributed
under the Creative Commons Attribution-ShareAlike 4.0 International license, under the Creative Commons Attribution-ShareAlike 4.0 International license,
you should have received a copy of the license file as CC-BY-SA-4.0. you should have received a copy of the license file as CC-BY-SA-4.0.
priv/static/images/pleroma-fox-tan.png
priv/static/images/pleroma-fox-tan-smol.png priv/static/images/pleroma-fox-tan-smol.png
priv/static/images/pleroma-tan.png
--- ---
@ -35,8 +36,6 @@ The following files are copyright © 2017-2020 Pleroma Authors
Attribution-ShareAlike 4.0 International license, you should have received Attribution-ShareAlike 4.0 International license, you should have received
a copy of the license file as CC-BY-SA-4.0. a copy of the license file as CC-BY-SA-4.0.
priv/static/images/avi.png
priv/static/images/banner.png
priv/static/instance/thumbnail.jpeg priv/static/instance/thumbnail.jpeg
--- ---