aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-09-27 07:57:53 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-09-27 20:27:08 +0200
commitff1a5362f7254d686864ea53994da6c517b3d3e8 (patch)
tree1edc0b6b46cf12bd17918355f7dbe090324e6f70 /app
parent55345331c47ca6f389e38a842584c3062476601d (diff)
downloadwallabag-ff1a5362f7254d686864ea53994da6c517b3d3e8.tar.gz
wallabag-ff1a5362f7254d686864ea53994da6c517b3d3e8.tar.zst
wallabag-ff1a5362f7254d686864ea53994da6c517b3d3e8.zip
Add Instapaper import
Also update ImportController with latest import (chrome, firefox & instapaper).
Diffstat (limited to 'app')
-rw-r--r--app/config/config.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index a4584a1b..cfb0d54d 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -55,7 +55,7 @@ wallabag_user:
55 registration_enabled: "%fosuser_registration%" 55 registration_enabled: "%fosuser_registration%"
56 56
57wallabag_import: 57wallabag_import:
58 allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] 58 allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv']
59 resource_dir: "%kernel.root_dir%/../web/uploads/import" 59 resource_dir: "%kernel.root_dir%/../web/uploads/import"
60 60
61# Twig Configuration 61# Twig Configuration