aboutsummaryrefslogtreecommitdiffhomepage
path: root/COPYING
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2015-03-15 14:21:59 +0100
committernodiscc <nodiscc@gmail.com>2015-03-15 14:21:59 +0100
commit9a631bab7fb7ca0c60c9fd1c688b3c58ecec40f8 (patch)
treea821338f733f60e13ad0319761dac74bf6f8be07 /COPYING
parentbc66d513a9aa6da9361dbfc2f0b4bf384e9597a6 (diff)
parentbdd1715b249561ed919e4f03a06aec1f4c327335 (diff)
downloadShaarli-9a631bab7fb7ca0c60c9fd1c688b3c58ecec40f8.tar.gz
Shaarli-9a631bab7fb7ca0c60c9fd1c688b3c58ecec40f8.tar.zst
Shaarli-9a631bab7fb7ca0c60c9fd1c688b3c58ecec40f8.zip
Merge remote-tracking branch 'ArthurHoaro/autocomplete' into next
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING8
1 files changed, 4 insertions, 4 deletions
diff --git a/COPYING b/COPYING
index 7312abd3..7e222aaf 100644
--- a/COPYING
+++ b/COPYING
@@ -47,10 +47,6 @@ Files: images/logo.png
47License: zlib/libpng 47License: zlib/libpng
48Copyright: (c) 2011-2014 idleman idleman@idleman.fr 48Copyright: (c) 2011-2014 idleman idleman@idleman.fr
49 49
50Files: Files: inc/jquery*.js, inc/jquery-ui*.js
51License: MIT License (http://opensource.org/licenses/MIT)
52Copyright: (C) jQuery Foundation and other contributors,https://jquery.com/download/
53
54Files: inc/blazy*.js 50Files: inc/blazy*.js
55License: MIT License (http://opensource.org/licenses/MIT) 51License: MIT License (http://opensource.org/licenses/MIT)
56Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy 52Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy
@@ -64,6 +60,10 @@ Copyright: 2011-2012, Federico Ulfo <rainelemental@gmail.com>
64 2011-2012, The Rain Team <hello@raintm.com> 60 2011-2012, The Rain Team <hello@raintm.com>
65License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt) 61License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt)
66 62
63Files: inc/awesomplete*
64License: MIT License (http://opensource.org/licenses/MIT)
65Copyright: (C) 2015 Lea Verou - https://github.com/LeaVerou/awesomplete
66
67---------------------------------------------------- 67----------------------------------------------------
68ZLIB/LIBPNG LICENSE 68ZLIB/LIBPNG LICENSE
69 69