diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-16 14:18:40 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-16 14:18:40 +0000 |
| commit | f2da7ebb572ff0128e236ca88e322f9fdabb35ec (patch) | |
| tree | d4f9b3aa4d338c8e2e3afa636de326f19bf6507e | |
| parent | 73289a8361aa6bb2cbd26873ccabe512fca6589b (diff) | |
| parent | e943c45800e1af56919b551b72224489e81bcd85 (diff) | |
| download | gitlab-ce-f2da7ebb572ff0128e236ca88e322f9fdabb35ec.tar.gz | |
Merge branch 'update-license' into 'master'
edit GitLab license info in regards to CC licensing
See merge request gitlab-org/gitlab-ce!18981
| -rw-r--r-- | LICENSE | 7 | ||||
| -rw-r--r-- | README.md | 2 |
2 files changed, 3 insertions, 6 deletions
@@ -4,9 +4,4 @@ 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. - ---- - -All Documentation content that resides under the doc/ directory of this -repository is licensed under Creative Commons: CC BY-SA 4.0. +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 diff --git a/README.md b/README.md index 9c1aad65307..013cac75c46 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,8 @@ GitLab Community Edition (CE) is available freely under the MIT Expat license. All third party components incorporated into the GitLab Software are licensed under the original license provided by the owner of the applicable component. +All Documentation content that resides under the doc/ directory of this repository is licensed under Creative Commons: CC BY-SA 4.0. + ## Install a development environment To work on GitLab itself, we recommend setting up your development environment with [the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit). |