diff options
author | tcit <tcit@tcit.fr> | 2014-10-08 19:26:26 +0200 |
---|---|---|
committer | tcit <tcit@tcit.fr> | 2014-10-08 19:26:26 +0200 |
commit | 8327f1c371ad1d930bf9c9a13e443f2aa29ecfe3 (patch) | |
tree | ea559def90e546716f3d6016fe8f06f333249ef6 /CREDITS.md | |
parent | d05f5eeb1dfd989e76f6040b220fe52738284841 (diff) | |
parent | 73c833780c37278a319fd3bfff172eede1a040bd (diff) | |
download | wallabag-8327f1c371ad1d930bf9c9a13e443f2aa29ecfe3.tar.gz wallabag-8327f1c371ad1d930bf9c9a13e443f2aa29ecfe3.tar.zst wallabag-8327f1c371ad1d930bf9c9a13e443f2aa29ecfe3.zip |
Merge branch 'dev' into data-for-mysql
Diffstat (limited to 'CREDITS.md')
-rw-r--r-- | CREDITS.md | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,7 +1,6 @@ | |||
1 | wallabag is based on : | 1 | wallabag is based on : |
2 | * PHP Readability https://bitbucket.org/fivefilters/php-readability | 2 | * PHP Readability https://bitbucket.org/fivefilters/php-readability |
3 | * Full Text RSS http://code.fivefilters.org/full-text-rss/src | 3 | * Full Text RSS http://code.fivefilters.org/full-text-rss/src |
4 | * Encoding https://github.com/neitanod/forceutf8 | ||
5 | * logo by Maylis Agniel https://github.com/wallabag/logo | 4 | * logo by Maylis Agniel https://github.com/wallabag/logo |
6 | * icons http://icomoon.io | 5 | * icons http://icomoon.io |
7 | * PHP Simple HTML DOM Parser (for Pocket import) http://simplehtmldom.sourceforge.net/ | 6 | * PHP Simple HTML DOM Parser (for Pocket import) http://simplehtmldom.sourceforge.net/ |
@@ -10,6 +9,8 @@ wallabag is based on : | |||
10 | * Flash messages https://github.com/plasticbrain/PHP-Flash-Messages | 9 | * Flash messages https://github.com/plasticbrain/PHP-Flash-Messages |
11 | * Pagination https://github.com/daveismyname/pagination | 10 | * Pagination https://github.com/daveismyname/pagination |
12 | 11 | ||
13 | wallabag is developed by Nicolas LÅ“uillet under the Do What the Fuck You Want to Public License | 12 | wallabag is mainly developed by Nicolas LÅ“uillet under the MIT License |
13 | |||
14 | Thank you so much to @tcitworld and @mariroz. | ||
14 | 15 | ||
15 | Contributors : https://github.com/wallabag/wallabag/graphs/contributors \ No newline at end of file | 16 | Contributors : https://github.com/wallabag/wallabag/graphs/contributors \ No newline at end of file |