logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 046bcf1bf66b9ece6017b7e06f650371d0ceb860
parent e7b1f0f5f4d9bb6f7eb384785bd2b0823059e086
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Wed, 17 Feb 2021 15:57:11 +0000

Merge branch 'chore/documentation-relicensing' into 'develop'

Relicense documentation under CC-BY-4.0

See merge request pleroma/pleroma!3322

Diffstat:

MCOPYING7+++++++
1 file changed, 7 insertions(+), 0 deletions(-)

diff --git 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.