From 77a7752a592af9ac821621a34d9955533baf40a0 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Wed, 30 Dec 2015 10:06:45 +0100
Subject: Update after previous merge

PR #1443 was merged into this branch to handle all import type in the same place.
---
 app/config/config.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/config')

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:
         en: 'English'
         fr: 'Français'
         de: 'Deutsch'
-    import:
-        allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
+
+wallabag_import:
+    allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
 
 # Twig Configuration
 twig:
-- 
cgit v1.2.3