diff options
author | Thomas Citharel <tcit@tcit.fr> | 2015-02-01 11:27:10 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2015-02-01 11:27:10 +0100 |
commit | b05f482dd219acd5f5c7e9669ad8bd168ba224c6 (patch) | |
tree | 4c89e1dc27201b34e35a8d9e3e8e461531978443 /CREDITS.md | |
parent | 3dcd85c075998ecdf2d54c5661c42e24080067d5 (diff) | |
parent | bc6f5a8086b331bf21cdfcac799788264d8cd3b2 (diff) | |
download | wallabag-b05f482dd219acd5f5c7e9669ad8bd168ba224c6.tar.gz wallabag-b05f482dd219acd5f5c7e9669ad8bd168ba224c6.tar.zst wallabag-b05f482dd219acd5f5c7e9669ad8bd168ba224c6.zip |
Merge branch 'dev' into reloadarticle
Diffstat (limited to 'CREDITS.md')
-rw-r--r-- | CREDITS.md | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 | ||
12 | wallabag is mainly developed by Nicolas LÅ“uillet under the MIT License | 13 | wallabag is mainly developed by Nicolas LÅ“uillet under the MIT License |
13 | 14 | ||
14 | Thank you so much to @tcitworld and @mariroz. | 15 | Thank you so much to @tcitworld and @mariroz. |
15 | 16 | ||
16 | Contributors : https://github.com/wallabag/wallabag/graphs/contributors \ No newline at end of file | 17 | Contributors : https://github.com/wallabag/wallabag/graphs/contributors |