diff options
author | Nicolas Lœuillet <nicolas.loeuillet@smile.fr> | 2014-10-10 13:33:54 +0200 |
---|---|---|
committer | Nicolas Lœuillet <nicolas.loeuillet@smile.fr> | 2014-10-10 13:33:54 +0200 |
commit | 44d35257e805856b4913c63fcbed3c0acb64bae8 (patch) | |
tree | 11e9d276c34b1b287706cb61182bdc71729661e2 /CREDITS.md | |
parent | af8292c1de1886cd975d79f0f42df40e0bd1c5bd (diff) | |
parent | cf8a5e1eedbed484dbcb1ddc9f7a13fc19b7a27b (diff) | |
download | wallabag-44d35257e805856b4913c63fcbed3c0acb64bae8.tar.gz wallabag-44d35257e805856b4913c63fcbed3c0acb64bae8.tar.zst wallabag-44d35257e805856b4913c63fcbed3c0acb64bae8.zip |
Merge branch 'dev'1.8.0
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/ |
@@ -11,6 +10,8 @@ wallabag is based on : | |||
11 | * Pagination https://github.com/daveismyname/pagination | 10 | * Pagination https://github.com/daveismyname/pagination |
12 | * PHPePub https://github.com/Grandt/PHPePub/ | 11 | * PHPePub https://github.com/Grandt/PHPePub/ |
13 | 12 | ||
14 | wallabag is developed by Nicolas Lœuillet under the Do What the Fuck You Want to Public License | 13 | wallabag is mainly developed by Nicolas Lœuillet under the MIT License |
14 | |||
15 | Thank you so much to @tcitworld and @mariroz. | ||
15 | 16 | ||
16 | Contributors : https://github.com/wallabag/wallabag/graphs/contributors | 17 | Contributors : https://github.com/wallabag/wallabag/graphs/contributors |