Merge remote-tracking branch 'origin/master' into 2.3

[github/wallabag/wallabag.git] / app / config / config.yml

diff --git a/app/config/config.yml b/app/config/config.yml
index 451809d640557c86c553d39663702c0fdf229ca3..9792616ec97e0182b8a0d3060215702af1630c41 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -3,6 +3,11 @@ imports:
     - { resource: security.yml }
     - { resource: services.yml }
 
+parameters:
+    # Allows to use the live reload feature for changes in assets
+    use_webpack_dev_server: false
+    craue_config.cache_adapter.class: Craue\ConfigBundle\CacheAdapter\SymfonyCacheComponentAdapter
+
 framework:
     #esi:             ~
     translator:
@@ -30,7 +35,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.2.2
+    version: 2.2.3
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
@@ -54,7 +59,7 @@ wallabag_core:
     action_mark_as_read: 1
     list_mode: 0
     fetching_error_message: |
-        wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
+        wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
     api_limit_mass_actions: 10
 
 wallabag_user: