diff options
author | nodiscc <nodiscc@gmail.com> | 2015-03-15 14:21:59 +0100 |
---|---|---|
committer | nodiscc <nodiscc@gmail.com> | 2015-03-15 14:21:59 +0100 |
commit | 9a631bab7fb7ca0c60c9fd1c688b3c58ecec40f8 (patch) | |
tree | a821338f733f60e13ad0319761dac74bf6f8be07 /COPYING | |
parent | bc66d513a9aa6da9361dbfc2f0b4bf384e9597a6 (diff) | |
parent | bdd1715b249561ed919e4f03a06aec1f4c327335 (diff) | |
download | Shaarli-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-- | COPYING | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -47,10 +47,6 @@ Files: images/logo.png | |||
47 | License: zlib/libpng | 47 | License: zlib/libpng |
48 | Copyright: (c) 2011-2014 idleman idleman@idleman.fr | 48 | Copyright: (c) 2011-2014 idleman idleman@idleman.fr |
49 | 49 | ||
50 | Files: Files: inc/jquery*.js, inc/jquery-ui*.js | ||
51 | License: MIT License (http://opensource.org/licenses/MIT) | ||
52 | Copyright: (C) jQuery Foundation and other contributors,https://jquery.com/download/ | ||
53 | |||
54 | Files: inc/blazy*.js | 50 | Files: inc/blazy*.js |
55 | License: MIT License (http://opensource.org/licenses/MIT) | 51 | License: MIT License (http://opensource.org/licenses/MIT) |
56 | Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy | 52 | Copyright: (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> |
65 | License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt) | 61 | License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt) |
66 | 62 | ||
63 | Files: inc/awesomplete* | ||
64 | License: MIT License (http://opensource.org/licenses/MIT) | ||
65 | Copyright: (C) 2015 Lea Verou - https://github.com/LeaVerou/awesomplete | ||
66 | |||
67 | ---------------------------------------------------- | 67 | ---------------------------------------------------- |
68 | ZLIB/LIBPNG LICENSE | 68 | ZLIB/LIBPNG LICENSE |
69 | 69 | ||