Merge remote-tracking branch 'wallabag/master'

1 files changed, 8 insertions, 3 deletions

diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 0fa23dbf..3b67d8f6 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -35,11 +35,16 @@ monolog:
                 VERBOSITY_DEBUG: DEBUG
             channels: [doctrine]
 
-assetic:
-    use_controller: true
-
 swiftmailer:
     # see http://mailcatcher.me/
     transport: smtp
     host: 'localhost'
     port: 1025
+
+# If you want to use cache for queries used in WallabagExtension
+# Uncomment the following lines
+#doctrine:
+#    orm:
+#        metadata_cache_driver: apcu
+#        result_cache_driver: apcu
+#        query_cache_driver: apcu