aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml15
-rw-r--r--app/config/config_dev.yml3
2 files changed, 1 insertions, 17 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 689cccec..c371cf73 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -28,7 +28,7 @@ framework:
28 assets: ~ 28 assets: ~
29 29
30wallabag_core: 30wallabag_core:
31 version: 2.0.4 31 version: 2.0.5
32 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 32 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
33 languages: 33 languages:
34 en: 'English' 34 en: 'English'
@@ -59,19 +59,6 @@ twig:
59 form_themes: 59 form_themes:
60 - "LexikFormFilterBundle:Form:form_div_layout.html.twig" 60 - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
61 61
62# Assetic Configuration
63assetic:
64 debug: "%kernel.debug%"
65 use_controller: false
66 bundles: [ ]
67 #java: /usr/bin/java
68 filters:
69 cssrewrite: ~
70 #closure:
71 # jar: "%kernel.root_dir%/Resources/java/compiler.jar"
72 #yui_css:
73 # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
74
75# Doctrine Configuration 62# Doctrine Configuration
76doctrine: 63doctrine:
77 dbal: 64 dbal:
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 2813e369..410d5a6c 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -34,9 +34,6 @@ monolog:
34 VERBOSITY_DEBUG: DEBUG 34 VERBOSITY_DEBUG: DEBUG
35 channels: [doctrine] 35 channels: [doctrine]
36 36
37assetic:
38 use_controller: true
39
40swiftmailer: 37swiftmailer:
41 # see http://mailcatcher.me/ 38 # see http://mailcatcher.me/
42 transport: smtp 39 transport: smtp