diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-01-07 22:15:08 +0100 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-01-07 22:15:08 +0100 |
commit | 39643c6b76d92d509b1af0228b6379d7fdce8a1c (patch) | |
tree | 931dceef7dbc8ae9911d01ded709d558417a6cdd /app/config/config.yml | |
parent | 488a468e3e11ff0ab6284afe232bf0f7fa68a8eb (diff) | |
parent | b88cf91fc8371194df78e690983c61ea94f266cd (diff) | |
download | wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.tar.gz wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.tar.zst wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.zip |
Merge pull request #1493 from wallabag/v2-pocket-import2.0.0-alpha.1
v2 – 1st draft for Pocket import via API & Wallabag v1 import
Diffstat (limited to 'app/config/config.yml')
-rw-r--r-- | app/config/config.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 8403a458..e50f9b52 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -31,6 +31,10 @@ wallabag_core: | |||
31 | fr: 'Français' | 31 | fr: 'Français' |
32 | de: 'Deutsch' | 32 | de: 'Deutsch' |
33 | 33 | ||
34 | wallabag_import: | ||
35 | allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] | ||
36 | resource_dir: "%kernel.root_dir%/../web/uploads/import" | ||
37 | |||
34 | # Twig Configuration | 38 | # Twig Configuration |
35 | twig: | 39 | twig: |
36 | debug: "%kernel.debug%" | 40 | debug: "%kernel.debug%" |