merge

[github/shaarli/Shaarli.git] / COPYING

diff --git a/COPYING b/COPYING
index 22929463e48ee2a32c7caf44649903c813a96483..d8241e5092e95eb44d0b239eaaa9a9d797cd0668 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -72,6 +72,14 @@ 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