From 715a31c1ed7ff856bae8ee4dc3536f3cf545f60a Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 1 Apr 2019 18:13:13 +0200 Subject: [PATCH] COPYING: wrap to 79, city.jpg Unsplash, wording [ci skip] --- COPYING | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/COPYING b/COPYING index 2275071a4..82fac8bbc 100644 --- a/COPYING +++ b/COPYING @@ -1,8 +1,13 @@ -Unless otherwise stated this repository is copyright © 2017-2019 Pleroma Authors , and is distributed under The GNU Affero General Public License Version 3, you should have received a copy of the license file in AGPL-3. +Unless otherwise stated this repository is copyright © 2017-2019 +Pleroma Authors , and is distributed under +The GNU Affero General Public License Version 3, you should have received a +copy of the license file in AGPL-3. --- -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 into CC-BY-SA-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. priv/static/images/pleroma-fox-tan.png priv/static/images/pleroma-fox-tan-smol.png @@ -10,13 +15,34 @@ priv/static/images/pleroma-tan.png --- -The following files are copyright © 2017-2019 Pleroma Authors , and are distributed under the Creative Commons Attribution-ShareAlike 4.0 International license, you should have received a copy of the license file into CC-BY-SA-4.0. +The following files are copyright © 2017-2019 Pleroma Authors +, 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. priv/static/images/avi.png priv/static/images/banner.png -priv/static/images/city.jpg priv/static/instance/thumbnail.jpeg --- -The files present under the priv/static/finmoji directory are copyright Finland , and are distributed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International license, you should have received a copy of the license file into CC-BY-NC-ND-4.0. +All photos published on Unsplash can be used for free. You can use them for +commercial and noncommercial purposes. You do not need to ask permission from +or provide credit to the photographer or Unsplash, although it is appreciated +when possible. + +More precisely, Unsplash grants you an irrevocable, nonexclusive, worldwide +copyright license to download, copy, modify, distribute, perform, and use +photos from Unsplash for free, including for commercial purposes, without +permission from or attributing the photographer or Unsplash. This license +does not include the right to compile photos from Unsplash to replicate +a similar or competing service. + +priv/static/images/city.jpg + +--- + +The files present under the priv/static/finmoji directory are copyright +Finland , and are distributed under the Creative +Commons Attribution-NonCommercial-NoDerivatives 4.0 International license, you +should have received a copy of the license file as CC-BY-NC-ND-4.0.