From: Nicolas Lœuillet <nicolas.loeuillet@smile.fr>
Date: Fri, 10 Oct 2014 11:33:36 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.8.0^2
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=cf8a5e1eedbed484dbcb1ddc9f7a13fc19b7a27b

Merge branch 'master' into dev

Conflicts:
	index.php
---

cf8a5e1eedbed484dbcb1ddc9f7a13fc19b7a27b
diff --cc CREDITS.md
index f1e9d7af,ffef5b33..e76c580d
--- a/CREDITS.md
+++ b/CREDITS.md
@@@ -8,9 -9,8 +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 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
+ Contributors : https://github.com/wallabag/wallabag/graphs/contributors