summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2021-02-17 15:57:11 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2021-02-17 15:57:11 +0000
commit046bcf1bf66b9ece6017b7e06f650371d0ceb860 (patch)
tree5778f01ea054e6ae76d9348a0f808e5569603555
parente7b1f0f5f4d9bb6f7eb384785bd2b0823059e086 (diff)
parentf1f215cb389c09fdf148923494a4dc6d5c029ce8 (diff)
Merge branch 'chore/documentation-relicensing' into 'develop'
Relicense documentation under CC-BY-4.0 See merge request pleroma/pleroma!3322
-rw-r--r--COPYING7
1 files changed, 7 insertions, 0 deletions
diff --git a/COPYING b/COPYING
index eb60dbd56..dd25f1d81 100644
--- a/COPYING
+++ b/COPYING
@@ -5,6 +5,13 @@ copy of the license file as AGPL-3.
---
+Files inside docs directory are copyright © 2021 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.
+
+---
+
The following files are copyright © 2019 shitposter.club, 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.