Merge branch 'master' into dev

[github/wallabag/wallabag.git] / CREDITS.md

diff --git a/CREDITS.md b/CREDITS.md
index 391f53c537f03f965274ac2fff48dc14f9214490..e76c580d38bd8060fdef8fd55a0e186617f4deb4 100644 (file)
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -1,15 +1,17 @@
 wallabag is based on :
 * PHP Readability https://bitbucket.org/fivefilters/php-readability
 * Full Text RSS http://code.fivefilters.org/full-text-rss/src
-* Encoding https://github.com/neitanod/forceutf8
-* logo by Brightmix http://www.iconfinder.com/icondetails/43256/128/jeans_monotone_pocket_icon
+* logo by Maylis Agniel https://github.com/wallabag/logo
 * icons http://icomoon.io
 * PHP Simple HTML DOM Parser (for Pocket import) http://simplehtmldom.sourceforge.net/
 * Session https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php
 * Twig http://twig.sensiolabs.org
 * Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
 * Pagination https://github.com/daveismyname/pagination
+* PHPePub https://github.com/Grandt/PHPePub/
 
-wallabag is developed by Nicolas Lœuillet under the Do What the Fuck You Want to Public License
+wallabag is mainly developed by Nicolas Lœuillet under the MIT License
 
-Contributors : https://github.com/wallabag/wallabag/graphs/contributors
\ No newline at end of file
+Thank you so much to @tcitworld and @mariroz.
+
+Contributors : https://github.com/wallabag/wallabag/graphs/contributors