diff options
| author | Thomas Citharel <tcit@tcit.fr> | 2015-01-03 11:38:32 +0100 |
|---|---|---|
| committer | Thomas Citharel <tcit@tcit.fr> | 2015-01-03 11:38:32 +0100 |
| commit | 82978fbd578a13f9e0d19633a5f1162ab2814002 (patch) | |
| tree | 2f332d97d3e8087f13ab479d820e9604ed5d2958 /CREDITS.md | |
| parent | 92ae99bd29a19ec71c5cc0bf3494aaf0bdaa1f74 (diff) | |
| parent | 1186b3b67ade6a7eece4478a4aa31f809d04e9ce (diff) | |
| download | wallabag-82978fbd578a13f9e0d19633a5f1162ab2814002.tar.gz wallabag-82978fbd578a13f9e0d19633a5f1162ab2814002.tar.zst wallabag-82978fbd578a13f9e0d19633a5f1162ab2814002.zip | |
Merge branch 'master' into dev
To get the errors
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 |