summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2022-03-06 18:29:37 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2022-03-06 18:29:37 +0000
commitee32e36b01516c1d6d412393d904e70df396eb82 (patch)
treecc2a1914a3193747d4338f7902e70c8e272a84fb /COPYING
parent0b686c6e541b2e12f86f91f93ef55149468d9738 (diff)
parent17aa3644be13a31ff0e8da0275de049b58780470 (diff)
downloadpleroma-ee32e36b01516c1d6d412393d904e70df396eb82.tar.gz
pleroma-ee32e36b01516c1d6d412393d904e70df396eb82.zip
Merge branch 'copyright-bump-2022' into 'develop'
Copyright bump for 2022 See merge request pleroma/pleroma!3593
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING6
1 files changed, 3 insertions, 3 deletions
diff --git a/COPYING b/COPYING
index dd25f1d81..4c2a28aa9 100644
--- a/COPYING
+++ b/COPYING
@@ -1,11 +1,11 @@
-Unless otherwise stated this repository is copyright © 2017-2021
+Unless otherwise stated this repository is copyright © 2017-2022
Pleroma Authors <https://pleroma.social/>, 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 copyright © 2022 Pleroma Authors
<https://pleroma.social/>, 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.
@@ -30,7 +30,7 @@ priv/static/images/pleroma-fox-tan-shy.png
---
-The following files are copyright © 2017-2020 Pleroma Authors
+The following files are copyright © 2017-2022 Pleroma Authors
<https://pleroma.social/>, and are distributed 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.