summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Hurewitz <jhurewitz@gitlab.com>2017-09-19 17:38:48 +0000
committerJamie Hurewitz <jhurewitz@gitlab.com>2017-09-19 17:38:48 +0000
commit1534dbb7a2ea2ccbad0e962cc0630d58889ed781 (patch)
treecdb0ad7b7add4b9e5d6adefa3c05645c0fabe02d
parente5b0f2167d341954c72ba885ab3154b158b322a5 (diff)
downloadgitlab-ce-1534dbb7a2ea2ccbad0e962cc0630d58889ed781.tar.gz
Update LICENSE to carve out third party licenses.jlh-mit-3rdparty-carveout
-rw-r--r--LICENSE6
1 files changed, 6 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index ad4f2872db5..15c423e1416 100644
--- a/LICENSE
+++ b/LICENSE
@@ -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