diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-07-25 07:27:21 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-07-25 07:27:21 +0200 |
| commit | fa9a7bbb3c61116e5db76c9f25ef2340fef971d7 (patch) | |
| tree | cd733e8548290158d578da185bd541e7fe4b1a31 /CREDITS.md | |
| parent | ebd6bf6007e0fad4c3e11dac0e79f687e1d195a2 (diff) | |
| parent | 830612f555d8bc72669fe9bc0686680001af0e52 (diff) | |
| download | wallabag-fa9a7bbb3c61116e5db76c9f25ef2340fef971d7.tar.gz wallabag-fa9a7bbb3c61116e5db76c9f25ef2340fef971d7.tar.zst wallabag-fa9a7bbb3c61116e5db76c9f25ef2340fef971d7.zip | |
Merge branch 'fix/securityAllowedActions' into dev
Diffstat (limited to 'CREDITS.md')
| -rw-r--r-- | CREDITS.md | 3 |
1 files changed, 1 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,6 @@ 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 |
| 14 | 13 | ||
| 15 | Contributors : https://github.com/wallabag/wallabag/graphs/contributors \ No newline at end of file | 14 | Contributors : https://github.com/wallabag/wallabag/graphs/contributors \ No newline at end of file |