diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-03 19:53:11 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-03 19:53:11 +0300 |
| commit | 48308728f202235fc55d8347ead1a1a428561205 (patch) | |
| tree | abf5e6c7d7ffcf2ba31cc38ca33a372592f7f01a | |
| parent | 969f3a9a789dccfc8e46255fdd01ee2a05a4dabf (diff) | |
| parent | 52e8f61195fbe413c029dac4913e671789244299 (diff) | |
Merge branch 'change-docs-license' into 'master'
Change the docs license to CC BY-SA
See merge request gitlab-org/gitlab-ce!18718
| -rw-r--r-- | CONTRIBUTING.md | 4 | ||||
| -rw-r--r-- | LICENSE | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0f97e779129..4f5d19ce2ce 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,6 +9,10 @@ terms. [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._ --- @@ -4,4 +4,9 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +--- + +All Documentation content that resides under the doc/ directory of this +repository is licensed under Creative Commons: CC BY-SA 4.0. |