diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-04 23:43:08 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-04 23:43:08 +0300 |
| commit | 45765918c377c6daf8ee8e5bfad4ea24f67766b6 (patch) | |
| tree | a8ccea9436d7c533a481939a4724c62d8ffac4c0 /COPYING | |
| parent | f7cd9131d4aa0da3c4c0174acc56ce1bbdbd284c (diff) | |
| parent | 9c9eec62c2fb67507708dd9e5d3f80a098881a6e (diff) | |
| download | pleroma-45765918c377c6daf8ee8e5bfad4ea24f67766b6.tar.gz pleroma-45765918c377c6daf8ee8e5bfad4ea24f67766b6.zip | |
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
Diffstat (limited to 'COPYING')
| -rw-r--r-- | COPYING | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/COPYING b/COPYING new file mode 100644 index 000000000..ceec519ae --- /dev/null +++ b/COPYING @@ -0,0 +1,48 @@ +Unless otherwise stated this repository is copyright © 2017-2019 +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. + +--- + +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 +priv/static/images/pleroma-tan.png + +--- + +The following files are copyright © 2017-2019 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. + +priv/static/images/avi.png +priv/static/images/banner.png +priv/static/instance/thumbnail.jpeg + +--- + +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 <https://finland.fi/emoji/>, 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. |