diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 21:09:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 21:09:39 +0300 |
| commit | 00fa950a34b1c94617110b150b8b2517d5241249 (patch) | |
| tree | 8f2d8683879079da8f520f7867ebd49b8beaadef /doc/development/licensing.md | |
| parent | c36152ff8c41fad2f413f253eb7ac5c927e47c56 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/licensing.md')
| -rw-r--r-- | doc/development/licensing.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/development/licensing.md b/doc/development/licensing.md index a716db6b407..c7676cc2596 100644 --- a/doc/development/licensing.md +++ b/doc/development/licensing.md @@ -57,6 +57,7 @@ Libraries with the following licenses are acceptable for use: - [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. +- [JSON License](https://www.json.org/license.html): Equivalent to the MIT license plus the statement, "The Software shall be used for Good, not Evil." ## Unacceptable Licenses |