diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 18:06:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 18:06:17 +0300 |
| commit | b5ad06174bb1de39438c90847abb86ac6988e944 (patch) | |
| tree | 1bb386b92f023fd2a8f776ccc10386675b3b1ef9 /doc/development/licensing.md | |
| parent | 0a6ffb540e569bd7a7c548d59b12bc55d4bf9cf1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/licensing.md')
| -rw-r--r-- | doc/development/licensing.md | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/development/licensing.md b/doc/development/licensing.md index 40ff604c7c4..052c90c2b37 100644 --- a/doc/development/licensing.md +++ b/doc/development/licensing.md @@ -65,7 +65,6 @@ Libraries with the following licenses require legal approval for use: - [GNU GPL](https://choosealicense.com/licenses/gpl-3.0/) (version 1, [version 2][GPLv2], [version 3][GPLv3], or any future versions): GPL-licensed libraries cannot be linked to from non-GPL projects. - [GNU AGPLv3](https://choosealicense.com/licenses/agpl-3.0/): AGPL-licensed libraries cannot be linked to from non-GPL projects. - [Open Software License (OSL)][OSL]: is a copyleft license. In addition, the FSF [recommend against its use][OSL-GNU]. -- [Facebook BSD + PATENTS][Facebook]: is a 3-clause BSD license with a patent grant that has been deemed [Category X][x-list] by the Apache foundation. - [WTFPL][WTFPL]: is a public domain dedication [rejected by the OSI (3.2)][WTFPL-OSI]. Also has a strong language which is not in accordance with our diversity policy. ## GPL Cooperation Commitment @@ -124,7 +123,6 @@ Dependencies which are only used in development or test environment are exempt f [Org-Repo]: https://gitlab.com/gitlab-com/organization [UNLICENSE]: https://unlicense.org [OWFa1]: http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0 -[Facebook]: https://code.facebook.com/pages/850928938376556 [x-list]: https://www.apache.org/legal/resolved.html#category-x [Acceptable-Licenses]: #acceptable-licenses [Unacceptable-Licenses]: #unacceptable-licenses |