Merge branch 'master' into dev

Conflicts:
	index.php

diff --git a/CREDITS.md b/CREDITS.md
index f1e9d7af4a13c1dd8aa1671ee1931fb4a7fb6951..e76c580d38bd8060fdef8fd55a0e186617f4deb4 100644 (file)
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -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
\ No newline at end of file
+Contributors : https://github.com/wallabag/wallabag/graphs/contributors