Commit 5d5f6ed7 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'change-docs-license-ee' into 'master'

Change the docs license to CC BY-SA

See merge request gitlab-org/gitlab-ee!5565
parents 133568f4 ab68ad87
...@@ -9,6 +9,10 @@ terms. ...@@ -9,6 +9,10 @@ terms.
[DCO + License](https://gitlab.com/gitlab-org/dco/blob/master/README.md) [DCO + License](https://gitlab.com/gitlab-org/dco/blob/master/README.md)
All Documentation content that resides under the [doc/ directory](/doc) of this
repository is licensed under Creative Commons:
[CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/).
_This notice should stay as the first item in the CONTRIBUTING.md file._ _This notice should stay as the first item in the CONTRIBUTING.md file._
--- ---
......
The GitLab Enterprise Edition (EE) license (the “EE License”) The GitLab Enterprise Edition (EE) license (the “EE License”)
Copyright (c) 2011-2017 GitLab B.V. Copyright (c) 2011-2018 GitLab B.V.
With regard to the GitLab Software: With regard to the GitLab Software:
...@@ -42,3 +42,8 @@ THE SOFTWARE. ...@@ -42,3 +42,8 @@ THE SOFTWARE.
For all third party components incorporated into the GitLab Software, those For all third party components incorporated into the GitLab Software, those
components are licensed under the original license provided by the owner of the components are licensed under the original license provided by the owner of the
applicable component. applicable component.
---
All Documentation content that resides under the doc/ directory of this
repository is licensed under Creative Commons: CC BY-SA 4.0.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment