diff options
author | Nick Thomas <nick@gitlab.com> | 2017-10-18 17:20:59 +0100 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2017-10-18 18:01:37 +0100 |
commit | 127ef49ff9f66c03ce7ac231c4ca163e7741bce6 (patch) | |
tree | 1bb1900200e4f4dcb8eb06858324e19731eb0f3a /doc/development/licensing.md | |
parent | 9c71fb0de2f0a7482b1a59c673142981ecdab26f (diff) | |
download | gitlab-ce-127ef49ff9f66c03ce7ac231c4ca163e7741bce6.tar.gz |
Update GraphQL licensing situation in the docs
Diffstat (limited to 'doc/development/licensing.md')
-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 a75cdf22f40..902b1c74a42 100644 --- a/doc/development/licensing.md +++ b/doc/development/licensing.md @@ -56,6 +56,7 @@ Libraries with the following licenses are acceptable for use: - [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. - [Unlicense][UNLICENSE]: Another public domain dedication. +- [OWFa 1.0][OWFa1]: An open-source license and patent grant designed for specifications. ## Unacceptable Licenses @@ -105,6 +106,7 @@ Gems which are included only in the "development" or "test" groups by Bundler ar [OSL-GNU]: https://www.gnu.org/licenses/license-list.en.html#OSL [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 |