aboutsummaryrefslogtreecommitdiffhomepage
path: root/COPYING.md
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2014-07-23 13:44:48 +0200
committerNicolas Lœuillet <nicolas@loeuillet.org>2014-07-23 13:44:48 +0200
commit887b015def3098f1e898e7bf3338fa2d093b6d95 (patch)
tree41206132200aa9390e11d600ad2b84ffa23242e4 /COPYING.md
parentebd6bf6007e0fad4c3e11dac0e79f687e1d195a2 (diff)
parent505a74ad1de7cf2cd3605e793233365501f03d87 (diff)
downloadwallabag-887b015def3098f1e898e7bf3338fa2d093b6d95.tar.gz
wallabag-887b015def3098f1e898e7bf3338fa2d093b6d95.tar.zst
wallabag-887b015def3098f1e898e7bf3338fa2d093b6d95.zip
Merge branch 'refactor' into dev
Diffstat (limited to 'COPYING.md')
-rw-r--r--COPYING.md27
1 files changed, 16 insertions, 11 deletions
diff --git a/COPYING.md b/COPYING.md
index ee7d6a54..c43f619a 100644
--- a/COPYING.md
+++ b/COPYING.md
@@ -1,14 +1,19 @@
1 DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE 1Copyright (c) 2013-2014 Nicolas Lœuillet
2 Version 2, December 2004
3 2
4 Copyright (C) 2004 Sam Hocevar <sam@hocevar.net> 3Permission is hereby granted, free of charge, to any person obtaining a copy
4of this software and associated documentation files (the "Software"), to deal
5in the Software without restriction, including without limitation the rights
6to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7copies of the Software, and to permit persons to whom the Software is furnished
8to do so, subject to the following conditions:
5 9
6 Everyone is permitted to copy and distribute verbatim or modified 10The above copyright notice and this permission notice shall be included in all
7 copies of this license document, and changing it is allowed as long 11copies or substantial portions of the Software.
8 as the name is changed.
9
10 DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
11 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
12
13 0. You just DO WHAT THE FUCK YOU WANT TO.
14 12
13THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19THE SOFTWARE. \ No newline at end of file