Keep up with master changes

[github/shaarli/Shaarli.git] / COPYING

diff --git a/COPYING b/COPYING
index 1044a3b04ad75e85d01ea221f451a2adea577e84..d8241e5092e95eb44d0b239eaaa9a9d797cd0668 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -68,6 +68,18 @@ 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
+
+Files: tpl/default/img/sad_star.png
+License: MIT License (http://opensource.org/licenses/MIT)
+Copyright: (C) 2015 kalvn - https://github.com/kalvn/Shaarli-Material
+
 ----------------------------------------------------
 ZLIB/LIBPNG LICENSE