summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-05-04 13:40:41 +0100
committerPhil Hughes <me@iamphill.com>2018-05-04 13:40:41 +0100
commit80617b9039ccbeeec07e299e41690be6ce2d95ec (patch)
treedc34efce00b956309c147ea59a786b58b47805b6 /LICENSE
parentcb8682b841b92cb6f97906bb9289ccbb13f2f31e (diff)
parentd9f3af500c1c3135a63014904459e5a4ab6bc395 (diff)
downloadgitlab-ce-80617b9039ccbeeec07e299e41690be6ce2d95ec.tar.gz
Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-commit-box
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE7
1 files changed, 6 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index a76372fad2c..a42e07dfe91 100644
--- a/LICENSE
+++ b/LICENSE
@@ -4,4 +4,9 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
The above copyright notice and this permission notice 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. \ No newline at end of file
+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.
+
+---
+
+All Documentation content that resides under the doc/ directory of this
+repository is licensed under Creative Commons: CC BY-SA 4.0.