diff options
| author | Matt Lee <mattl@gitlab.com> | 2016-09-29 17:00:21 -0400 |
|---|---|---|
| committer | Matt Lee <mattl@gitlab.com> | 2016-09-29 17:00:21 -0400 |
| commit | 1553275ebc5ecccda208c1138755edf9b3198700 (patch) | |
| tree | 14cb9e233a8d7446bde920b39085eee8cd688f1b | |
| parent | 80373392d7a1e454ecf996bc56c521367ca376cd (diff) | |
| download | gitlab-ce-1553275ebc5ecccda208c1138755edf9b3198700.tar.gz | |
Added CC0 license to list of licenses
| -rw-r--r-- | doc/development/licensing.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/development/licensing.md b/doc/development/licensing.md index 8c8c7486fff..05972b33fdb 100644 --- a/doc/development/licensing.md +++ b/doc/development/licensing.md @@ -54,6 +54,7 @@ Libraries with the following licenses are acceptable for use: - [BSD 2-Clause License][BSD-2-Clause]: A permissive (non-copyleft) license as defined by the Open Source Initiative. - [BSD 3-Clause License][BSD-3-Clause] (also known as New BSD or Modified BSD): A permissive (non-copyleft) license as defined by the Open Source Initiative - [ISC License][ISC] (also known as the OpenBSD License): A permissive (non-copyleft) license as defined by the Open Source Initiative. +- [Creative Commons Zero (CC0)][CC0]: A public domain dedication, recommended as a way to disclaim copyright on your work to the maximum extent possible. ## Unacceptable Licenses @@ -85,6 +86,7 @@ Gems which are included only in the "development" or "test" groups by Bundler ar [BSD-2-Clause]: https://opensource.org/licenses/BSD-2-Clause [BSD-3-Clause]: https://opensource.org/licenses/BSD-3-Clause [ISC]: https://opensource.org/licenses/ISC +[CC0]: https://creativecommons.org/publicdomain/zero/1.0/ [GPL]: http://choosealicense.com/licenses/gpl-3.0/ [GPLv2]: http://www.gnu.org/licenses/gpl-2.0.txt [GPLv3]: http://www.gnu.org/licenses/gpl-3.0.txt |