Merge branch 'master' into dev

Conflicts: index.php
8 years ago · cf8a5e1eed
1 changed files with 2 additions and 1 deletions
--- a/CREDITS.md
+++ b/CREDITS.md
@ -8,9 +8,10 @@ wallabag is based on :
				@@ -8,9 +8,10 @@ wallabag is based on :
 * 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 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
+Contributors : https://github.com/wallabag/wallabag/graphs/contributors