summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-22 09:49:02 +0000
committerDouwe Maan <douwe@gitlab.com>2018-01-22 09:49:02 +0000
commit92a4cb5403b6860390f98c22b3741ce8017217b2 (patch)
tree1f32087bbedaafdba7ab1d1f6c4524e47fdce3c4
parentb51e0b58084e54e2118c345689dbeba05469a4d3 (diff)
downloadgitlab-shell-92a4cb5403b6860390f98c22b3741ce8017217b2.tar.gz
Update LICENSE in line with https://about.gitlab.com/handbook/engineering/#gitlab-repositories
-rw-r--r--LICENSE7
1 files changed, 6 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index d691a8c..4abe8b8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,6 @@
-Copyright (c) 2013 Dmitriy Zaporozhets
+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
@@ -18,3 +20,6 @@ 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.