diff options
| author | Thomas Citharel <tcit@tcit.fr> | 2015-02-01 11:33:41 +0100 |
|---|---|---|
| committer | Thomas Citharel <tcit@tcit.fr> | 2015-02-01 11:33:41 +0100 |
| commit | c416cab8c9297d17f073c66d07bafab8b5068db2 (patch) | |
| tree | 5f6342c866127675e3c59e1b664adc257262d86c /CREDITS.md | |
| parent | e51487f93265521cf04d8752b0554bb1f05dd189 (diff) | |
| parent | bc6f5a8086b331bf21cdfcac799788264d8cd3b2 (diff) | |
| download | wallabag-c416cab8c9297d17f073c66d07bafab8b5068db2.tar.gz wallabag-c416cab8c9297d17f073c66d07bafab8b5068db2.tar.zst wallabag-c416cab8c9297d17f073c66d07bafab8b5068db2.zip | |
Merge branch 'dev' into randomarticle
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 |