Browse Source

Merge branch 'master' into dev

Conflicts:
	index.php
master
Nicolas Lœuillet 8 years ago
parent
commit
cf8a5e1eed
  1. 3
      CREDITS.md

3
CREDITS.md

@ -8,9 +8,10 @@ wallabag is based on : @@ -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

Loading…
Cancel
Save