Redirect to home page after deleting a link

[github/shaarli/Shaarli.git] / COPYING

diff --git a/COPYING b/COPYING
index d9731d27d269136a484b8b0dbca9dafe812aa32c..91ef03402d66ee06bfc6226f3683ea0e7716fed5 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,52 @@
-Shaarli is distributed under the zlib/libpng License:
+Files: * 
+License: zlib/libpng
+Copyright: (c) 2011-2014 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
+           (c) 2011-2014 Alexandre Alapetite <alexandre@alapetite.fr>
+           (c) 2011-2014 David Sferruzza <david.sferruzza@gmail.com>
+           (c) 2011-2014 Christophe HENRY <christophe.henry@sbgodin.fr>
+           (c) 2011-2014 Mathieu Chabanon <git@matchab.fr>
+           (c) 2011-2014 BoboTiG <bobotig@gmail.com>
+           (c) 2011-2014 Bronco <bronco@warriordudimanche.net>
+           (c) 2011-2014 Emilien Klein <emilien@klein.st>
+           (c) 2011-2014 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org>
+           (c) 2011-2014 Lionel Martin <renarddesmers@gmail.com>
+           (c) 2011-2014 lehollandaisvolant <levoltigeurhollandais@gmail.com>
+           (c) 2011-2014 timo van neerden <fire@lehollandaisvolant.net>
+           (c) 2011-2014 nodiscc <nodiscc@gmail.com>
+
+
+
+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
+License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
+Copyright: (c) 2014 Yusuke Kamiyamane
+Source: http://p.yusukekamiyamane.com/
+
+Files: images/delete_icon.png
+License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
+Copyright: (c) 2014 Designmodo
+Source: http://designmodo.com/linecons-free/
+
+
+Files: images/floral_left.png, images/floral_right.png, images/squiggle.png, images/squiggle2.png, images/squiggle_closing.png
+Licence: Public Domain
+Source: https://openclipart.org/people/j4p4n/j4p4n_ornimental_bookend_-_left.svg
+
+
+Files: images/Paper_texture_v5_by_bashcorpo_w1000.jpg
+Licence: Public Domain
+Source: http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998
+
+Files: images/logo.png
+License: zlib/libpng
+Copyright: (c) 2011-2014 idleman idleman@idleman.fr
+
+Files: ins/qr.min.js
+License: GPLv3
+Copyright: (C) 2014 Alasdair Mercer, http://neocotic.com
+
+--------------------------------------------------------
+ZLIB/LIBPNG LICENSE

 
 

-Copyright (c) 2011 Sébastien SAUVAGE (sebsauvage.net)

 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from


@@ -19,3 +65,19 @@ freely, subject to the following restrictions:
      not be misrepresented as being the original software.
 
   3. This notice may not be removed or altered from any source distribution.
      not be misrepresented as being the original software.
 
   3. This notice may not be removed or altered from any source distribution.

+
+----------------------------------------------------
+GPLv3 LICENSE
+
+This program is free software: you can redistribute it and/or modify  
+it under the terms of the GNU General Public License as published by  
+the Free Software Foundation, either version 3 of the License, or  
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,  
+but WITHOUT ANY WARRANTY; without even the implied warranty of  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License  
+along with this program. If not, see <http://www.gnu.org/licenses/>.
\ No newline at end of file