Merge branch 'master' into dev

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

diff --git a/CREDITS.md b/CREDITS.md
index ffef5b33f92d074344b2d20dc66b96a235a9cd4f..e76c580d38bd8060fdef8fd55a0e186617f4deb4 100644 (file)
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -1,7 +1,6 @@
 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 Maylis Agniel https://github.com/wallabag/logo
 * icons http://icomoon.io
 * PHP Simple HTML DOM Parser (for Pocket import) http://simplehtmldom.sourceforge.net/
@@ -11,6 +10,8 @@ wallabag is based on :
 * 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
+
+Thank you so much to @tcitworld and @mariroz.
 
 Contributors : https://github.com/wallabag/wallabag/graphs/contributors