diff options
Diffstat (limited to 'COPYING')
-rw-r--r-- | COPYING | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -1,4 +1,4 @@ | |||
1 | Files: * | 1 | Files: * |
2 | License: zlib/libpng | 2 | License: zlib/libpng |
3 | Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net> | 3 | Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net> |
4 | (c) 2011-2015 Alexandre Alapetite <alexandre@alapetite.fr> | 4 | (c) 2011-2015 Alexandre Alapetite <alexandre@alapetite.fr> |
@@ -31,9 +31,9 @@ Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net> | |||
31 | 31 | ||
32 | Files: inc/reset.css | 32 | Files: inc/reset.css |
33 | License: BSD (http://opensource.org/licenses/BSD-3-Clause) | 33 | License: BSD (http://opensource.org/licenses/BSD-3-Clause) |
34 | Copyright: (c) 2010, Yahoo! Inc. | 34 | Copyright: (c) 2010, Yahoo! Inc. |
35 | 35 | ||
36 | Files: images/calendar.png, images/edit_icon.png, images/feed-icon-14x14.png, images/private.png, images/private_16x16.png, images/private_16x16_active.png, images/qrcode.png, images/tag_blue.png | 36 | Files: images/calendar.png, images/edit_icon.png, images/feed-icon-14x14.png, images/private.png, images/private_16x16.png, images/private_16x16_active.png, images/tag_blue.png |
37 | License: CC-BY (http://creativecommons.org/licenses/by/3.0/) | 37 | License: CC-BY (http://creativecommons.org/licenses/by/3.0/) |
38 | Copyright: (c) 2014 Yusuke Kamiyamane | 38 | Copyright: (c) 2014 Yusuke Kamiyamane |
39 | Source: http://p.yusukekamiyamane.com/ | 39 | Source: http://p.yusukekamiyamane.com/ |
@@ -59,10 +59,6 @@ Files: inc/blazy*.js | |||
59 | License: MIT License (http://opensource.org/licenses/MIT) | 59 | License: MIT License (http://opensource.org/licenses/MIT) |
60 | Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy | 60 | Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy |
61 | 61 | ||
62 | Files: inc/qr.js | ||
63 | License: GPLv3 License (http://opensource.org/licenses/gpl-3.0) | ||
64 | Copyright: (C) 2014 Alasdair Mercer, http://neocotic.com, https://github.com/neocotic/qr.js | ||
65 | |||
66 | Files: inc/rain.tpl.class.php | 62 | Files: inc/rain.tpl.class.php |
67 | Copyright: 2011-2012, Federico Ulfo <rainelemental@gmail.com> | 63 | Copyright: 2011-2012, Federico Ulfo <rainelemental@gmail.com> |
68 | 2011-2012, The Rain Team <hello@raintm.com> | 64 | 2011-2012, The Rain Team <hello@raintm.com> |
@@ -72,6 +68,10 @@ Files: inc/awesomplete* | |||
72 | License: MIT License (http://opensource.org/licenses/MIT) | 68 | License: MIT License (http://opensource.org/licenses/MIT) |
73 | Copyright: (C) 2015 Lea Verou - https://github.com/LeaVerou/awesomplete | 69 | Copyright: (C) 2015 Lea Verou - https://github.com/LeaVerou/awesomplete |
74 | 70 | ||
71 | Files: plugins/wallabag/wallabag.png | ||
72 | License: MIT License (http://opensource.org/licenses/MIT) | ||
73 | Copyright: (C) 2015 Nicolas Lœuillet - https://github.com/wallabag/wallabag | ||
74 | |||
75 | ---------------------------------------------------- | 75 | ---------------------------------------------------- |
76 | ZLIB/LIBPNG LICENSE | 76 | ZLIB/LIBPNG LICENSE |
77 | 77 | ||
@@ -80,10 +80,10 @@ In no event will the authors be held liable for any damages arising from | |||
80 | the use of this software. | 80 | the use of this software. |
81 | 81 | ||
82 | Permission is granted to anyone to use this software for any purpose, | 82 | Permission is granted to anyone to use this software for any purpose, |
83 | including commercial applications, and to alter it and redistribute it | 83 | including commercial applications, and to alter it and redistribute it |
84 | freely, subject to the following restrictions: | 84 | freely, subject to the following restrictions: |
85 | 85 | ||
86 | 1. The origin of this software must not be misrepresented; you must not | 86 | 1. The origin of this software must not be misrepresented; you must not |
87 | claim that you wrote the original software. If you use this software | 87 | claim that you wrote the original software. If you use this software |
88 | in a product, an acknowledgment in the product documentation would | 88 | in a product, an acknowledgment in the product documentation would |
89 | be appreciated but is not required. | 89 | be appreciated but is not required. |