diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-09-20 02:10:24 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-09-20 02:10:24 +0000 |
| commit | 2372bfa9925a34fdbd30f8c7c474b91025395dd5 (patch) | |
| tree | f8db61b9ff6d83af829e31f15b834d49711b34a7 | |
| parent | 8aac719fd6e2f205ec5c4c29590fb0e4944b7e43 (diff) | |
| parent | 1534dbb7a2ea2ccbad0e962cc0630d58889ed781 (diff) | |
| download | gitlab-ce-2372bfa9925a34fdbd30f8c7c474b91025395dd5.tar.gz | |
Merge branch 'jlh-mit-3rdparty-carveout' into 'master'
Update LICENSE to carve out third party licenses.
See merge request gitlab-org/gitlab-ce!14374
| -rw-r--r-- | LICENSE | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,5 +1,7 @@ Copyright (c) 2011-2017 GitLab B.V. +With regard to the GitLab 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 @@ -17,3 +19,7 @@ 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. + +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.
\ No newline at end of file |