pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 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
parent 6b0894c66a af8292c1de
commit cf8a5e1eed
1 changed files with 2 additions and 1 deletions
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
* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
* Pagination https://github.com/daveismyname/pagination
* PHPePub https://github.com/Grandt/PHPePub/
wallabag is mainly developed by Nicolas Lœuillet under the MIT License
Thank you so much to @tcitworld and @mariroz.
Contributors : https://github.com/wallabag/wallabag/graphs/contributors
Contributors : https://github.com/wallabag/wallabag/graphs/contributors