summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-01-10 20:41:27 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-01-10 20:41:27 -0500
commit74cbc2733990f47a07a8c6e15138aae7597d0cd0 (patch)
treee93b38be4e4db93c325c349be512c9ebdaca5546 /LICENSE
parent776844f5b2d6b7f36a830786d4fa27cc4b47de57 (diff)
downloadgitlab-ce-74cbc2733990f47a07a8c6e15138aae7597d0cd0.tar.gz
Update LICENSE copyright notice to 2016
Also reformats paragraphs for a max width of 80 chars [ci skip]
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE37
1 files changed, 19 insertions, 18 deletions
diff --git a/LICENSE b/LICENSE
index 7c8832dadfb..f3acdb3e3ec 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
The GitLab Enterprise Edition (EE) license (the “EE License”)
-Copyright (c) 2011-2015 GitLab B.V.
+Copyright (c) 2011-2016 GitLab B.V.
This software and associated documentation files (the "Software") may only be
used if you (and any entity that you represent) have agreed to, and are in
@@ -9,22 +9,23 @@ have a valid GitLab Enterprise Edition subscription for the correct number of
user seats. Subject to the foregoing sentence, you are free to modify this
Software and publish patches to the Software. You agree that GitLab and/or its
licensors (as applicable) retain all right, title and interest in and to all
-Software incorporated in such modifications and/or patches, and all such Software
-may only be used, copied, modified, displayed, distributed, or otherwise exploited
-with a valid GitLab Enterprise Edition subscription for the correct number of user
-seats. Subject to the foregoing, it is forbidden to copy, merge, publish, distribute,
-sublicense, and/or sell the Software.
+Software incorporated in such modifications and/or patches, and all such
+Software may only be used, copied, modified, displayed, distributed, or
+otherwise exploited with a valid GitLab Enterprise Edition subscription for the
+correct number of user seats. Subject to the foregoing, it is forbidden to
+copy, merge, publish, distribute, sublicense, and/or sell the Software.
-This EE License applies only to the part of this Software that is not distributed as
-part of GitLab Community Edition (CE), and that is not a file that produces client-side
-JavaScript, in whole or in part. Any part of this Software distributed as part of GitLab
-CE or that is a file that produces 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.
+This EE License applies only to the part of this Software that is not
+distributed as part of GitLab Community Edition (CE), and that is not a file
+that produces client-side JavaScript, in whole or in part. Any part of this
+Software distributed as part of GitLab CE or that is a file that produces
+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.
-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.
+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.