diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2015-12-30 10:06:45 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-01-02 23:27:41 +0100 |
| commit | 77a7752a592af9ac821621a34d9955533baf40a0 (patch) | |
| tree | 304b29f1d01a93a61f75f3206aabf845ff3fbe35 /app/config/config.yml | |
| parent | 7ec2897ee0ad190dcb9f77032d785f2f9661b754 (diff) | |
| download | wallabag-77a7752a592af9ac821621a34d9955533baf40a0.tar.gz wallabag-77a7752a592af9ac821621a34d9955533baf40a0.tar.zst wallabag-77a7752a592af9ac821621a34d9955533baf40a0.zip | |
Update after previous merge
PR #1443 was merged into this branch to handle all import type in the same place.
Diffstat (limited to 'app/config/config.yml')
| -rw-r--r-- | app/config/config.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 421b2db5..4d04d002 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
| @@ -30,8 +30,9 @@ wallabag_core: | |||
| 30 | en: 'English' | 30 | en: 'English' |
| 31 | fr: 'Français' | 31 | fr: 'Français' |
| 32 | de: 'Deutsch' | 32 | de: 'Deutsch' |
| 33 | import: | 33 | |
| 34 | allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] | 34 | wallabag_import: |
| 35 | allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] | ||
| 35 | 36 | ||
| 36 | # Twig Configuration | 37 | # Twig Configuration |
| 37 | twig: | 38 | twig: |