summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2017-11-01 19:14:27 +0000
committerMarcia Ramos <virtua.creative@gmail.com>2017-11-01 19:14:27 +0000
commit22419ba2802f67f4a90a947d66008c845776f838 (patch)
tree43012d4b34196ce7ff6572b85d477b7b82bb0977
parent17fcfb436003ce2e990e43960f569651e894173e (diff)
parent6c18c87dd6843e1e18f36434cc2cb0e828a36a7f (diff)
downloadgitlab-ce-22419ba2802f67f4a90a947d66008c845776f838.tar.gz
Merge branch 'dco' into 'master'
Move from doc to repo. See merge request gitlab-org/gitlab-ce!15139
-rw-r--r--CONTRIBUTING.md11
1 files changed, 5 insertions, 6 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7ad432a9bc2..9a26bed3d29 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,14 +1,13 @@
## Developer Certificate of Origin + License
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
+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.
-[DCO + License](https://docs.google.com/document/d/1HQGOMtkXU1Pipp46M5H4Un4M2xAc4D1wckTnrtii0Lo/edit)
-
+[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._