mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-16 18:55:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse source 
Conflicts:
	index.php
This commit is contained in:
Nicolas Lœuillet 2014-10-10 13:33:36 +02:00
commit cf8a5e1eed
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CREDITS.md
View file

@ -8,9 +8,10 @@ wallabag is based on :
* Twig http://twig.sensiolabs.org * Twig http://twig.sensiolabs.org
* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages * Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
* Pagination https://github.com/daveismyname/pagination * Pagination https://github.com/daveismyname/pagination
* PHPePub https://github.com/Grandt/PHPePub/
wallabag is mainly developed by Nicolas Lœuillet under the MIT License wallabag is mainly developed by Nicolas Lœuillet under the MIT License
Thank you so much to @tcitworld and @mariroz. Thank you so much to @tcitworld and @mariroz.
Contributors : https://github.com/wallabag/wallabag/graphs/contributors Contributors : https://github.com/wallabag/wallabag/graphs/contributors