diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2017-11-17 14:48:43 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2017-11-17 14:49:15 +0300 |
commit | 08171487ecc709c301e18564b6e65718af8fedf7 (patch) | |
tree | 79acc6e55307c098f3f78f3eef78dfabac79ea73 /CONTRIBUTING.md | |
parent | 778119eceaa6aa968c4c44d0e635071ae98a773e (diff) |
Update license
https://gitlab.com/gitlab-com/organization/issues/146
[ci skip]
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r-- | CONTRIBUTING.md | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e132d83b..442c2b00 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,13 +1,12 @@ -## Contributor license agreement +## Developer Certificate of Origin + License -By submitting code as an individual you agree to the [individual contributor -license agreement][individual-agreement]. +By contributing to GitLab B.V., You accept and agree to the following terms and +conditions for Your present and future Contributions submitted to GitLab B.V. +Except for the license granted herein to GitLab B.V. and recipients of software +distributed by GitLab B.V., You reserve all right, title, and interest in and to +Your Contributions. All Contributions are subject to the following DCO + License +terms. -By submitting code as an entity you agree to the [corporate contributor license -agreement][corporate-agreement]. - -For more information about the technicalities of contributing please see the [README](README.md). - -[individual-agreement]: https://docs.gitlab.com/ee/legal/individual_contributor_license_agreement.html -[corporate-agreement]: https://docs.gitlab.com/ee/legal/corporate_contributor_license_agreement.html +[DCO + License](https://gitlab.com/gitlab-org/dco/blob/master/README.md) +_This notice should stay as the first item in the CONTRIBUTING.md file._ |