diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2018-09-10 23:41:41 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2018-09-10 23:41:42 +0000 |
| commit | 3e9138e0251b5b784f3a7dc654ac7b60b86250b4 (patch) | |
| tree | ec6df4076ee18f3a4506799df17f923f7ddf7def /LICENSE | |
| parent | 3c7e94f423bc0db54ac39c306f3cbb4924dedf5b (diff) | |
| parent | 2f990e3408d00cad473d8dcf8a4e49155cc3cc33 (diff) | |
| download | gitlab-ce-3e9138e0251b5b784f3a7dc654ac7b60b86250b4.tar.gz | |
Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-10
# Conflicts:
# LICENSE
[ci skip]
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 18 |
1 files changed, 18 insertions, 0 deletions
@@ -1,6 +1,7 @@ The GitLab Enterprise Edition (EE) license (the “EE License”) Copyright (c) 2011-2018 GitLab B.V. +<<<<<<< HEAD With regard to the GitLab Software: This software and associated documentation files (the "Software") may only be @@ -31,14 +32,31 @@ client-side JavaScript, in whole or in part, is copyrighted under the MIT Expat license. The full text of this EE License shall be included in all copies or substantial portions of the Software. +======= +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +>>>>>>> upstream/master 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, +<<<<<<< HEAD OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. For all third party components incorporated into the GitLab Software, those components are licensed under the original license provided by the owner of the applicable component. +======= +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +>>>>>>> upstream/master |