aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas.loeuillet@smile.fr>2014-10-10 13:33:36 +0200
committerNicolas Lœuillet <nicolas.loeuillet@smile.fr>2014-10-10 13:33:36 +0200
commitcf8a5e1eedbed484dbcb1ddc9f7a13fc19b7a27b (patch)
tree11e9d276c34b1b287706cb61182bdc71729661e2
parent6b0894c66ad545c04685aaefcc5e89726e2ed4e9 (diff)
parentaf8292c1de1886cd975d79f0f42df40e0bd1c5bd (diff)
downloadwallabag-cf8a5e1eedbed484dbcb1ddc9f7a13fc19b7a27b.tar.gz
wallabag-cf8a5e1eedbed484dbcb1ddc9f7a13fc19b7a27b.tar.zst
wallabag-cf8a5e1eedbed484dbcb1ddc9f7a13fc19b7a27b.zip
Merge branch 'master' into dev
Conflicts: index.php
-rw-r--r--CREDITS.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/CREDITS.md b/CREDITS.md
index f1e9d7af..e76c580d 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -8,9 +8,10 @@ wallabag is based on :
8* Twig http://twig.sensiolabs.org 8* Twig http://twig.sensiolabs.org
9* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages 9* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
10* Pagination https://github.com/daveismyname/pagination 10* Pagination https://github.com/daveismyname/pagination
11* PHPePub https://github.com/Grandt/PHPePub/
11 12
12wallabag is mainly developed by Nicolas Lœuillet under the MIT License 13wallabag is mainly developed by Nicolas Lœuillet under the MIT License
13 14
14Thank you so much to @tcitworld and @mariroz. 15Thank you so much to @tcitworld and @mariroz.
15 16
16Contributors : https://github.com/wallabag/wallabag/graphs/contributors \ No newline at end of file 17Contributors : https://github.com/wallabag/wallabag/graphs/contributors