X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=COPYING;h=28939100b8779e12a4f59184bdc2b367e010e50a;hb=f1f1156d84176271119cc1f50bb9bcf949ff2dce;hp=adc856e297964d8ee91dab64e58e725dbcfd4998;hpb=a02257b8aed58ef2f8536c877ce2fb222f84ac40;p=github%2Fshaarli%2FShaarli.git

diff --git a/COPYING b/COPYING
index adc856e2..28939100 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Files: * 
+Files: *
 License: zlib/libpng
 Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
            (c) 2011-2015 Alexandre Alapetite <alexandre@alapetite.fr>
@@ -20,6 +20,8 @@ Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
            (c) 2011-2015 idleman <idleman@idleman.fr>
            (c) 2015 Alexis Ju <alexis@effingo.be>
            (c) 2015 dimtion <zizou.xena@gmail.com>
+           (c) 2015 Fanch <fanch-github@qth.fr>
+           (c) 2015 Guillaume Virlet <github@virlet.org>
            (c) 2015 Felix Bartels <felix@host-consultants.de>
            (c) 2015 Marsup <marsup@gmail.com>
            (c) 2015 Miloš Jovanović <mjovanovic@gmail.com>
@@ -29,9 +31,9 @@ Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
 
 Files: inc/reset.css
 License: BSD (http://opensource.org/licenses/BSD-3-Clause)
-Copyright: (c) 2010, Yahoo! Inc. 
+Copyright: (c) 2010, Yahoo! Inc.
 
-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
+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
 License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
 Copyright: (c) 2014 Yusuke Kamiyamane
 Source: http://p.yusukekamiyamane.com/
@@ -57,10 +59,6 @@ Files: inc/blazy*.js
 License: MIT License (http://opensource.org/licenses/MIT)
 Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy
 
-Files: inc/qr.js
-License: GPLv3 License (http://opensource.org/licenses/gpl-3.0)
-Copyright: (C) 2014 Alasdair Mercer, http://neocotic.com, https://github.com/neocotic/qr.js
-
 Files: inc/rain.tpl.class.php
 Copyright: 2011-2012, Federico Ulfo <rainelemental@gmail.com>
            2011-2012, The Rain Team <hello@raintm.com>
@@ -70,6 +68,14 @@ Files: inc/awesomplete*
 License: MIT License (http://opensource.org/licenses/MIT)
 Copyright: (C) 2015 Lea Verou - https://github.com/LeaVerou/awesomplete
 
+Files: plugins/wallabag/wallabag.png
+License: MIT License (http://opensource.org/licenses/MIT)
+Copyright: (C) 2015 Nicolas Lœuillet - https://github.com/wallabag/wallabag
+
+Files: plugins/markdown/Parsedown.php
+License: MIT License (http://opensource.org/licenses/MIT)
+Copyright: (C) 2015 Emanuil Rusev - https://github.com/erusev/parsedown
+
 ----------------------------------------------------
 ZLIB/LIBPNG LICENSE
 
@@ -78,10 +84,10 @@ In no event will the authors be held liable for any damages arising from
 the use of this software.
 
 Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it 
+including commercial applications, and to alter it and redistribute it
 freely, subject to the following restrictions:
 
-  1. The origin of this software must not be misrepresented; you must not 
+  1. The origin of this software must not be misrepresented; you must not
      claim that you wrote the original software. If you use this software
      in a product, an acknowledgment in the product documentation would
      be appreciated but is not required.