diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-06-23 09:18:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-23 09:18:18 +0200 |
commit | d37bb05c881bfdbeb1144b327edd4dcc2cbb163f (patch) | |
tree | 1b90f7e733a83af4741a8cb7f49edf3e303f8677 /app/config/config.yml | |
parent | 891a026e31ad54ca90b70f6026f23260cfadb7fd (diff) | |
parent | 99451fe4b76051d61922a6beb7ee9e79cc6e7893 (diff) | |
download | wallabag-d37bb05c881bfdbeb1144b327edd4dcc2cbb163f.tar.gz wallabag-d37bb05c881bfdbeb1144b327edd4dcc2cbb163f.tar.zst wallabag-d37bb05c881bfdbeb1144b327edd4dcc2cbb163f.zip |
Merge pull request #2132 from wallabag/sf3.1
Jump to Symfony 3.1
Diffstat (limited to 'app/config/config.yml')
-rw-r--r-- | app/config/config.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index ea028d85..9e2e08a6 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -169,7 +169,7 @@ liip_theme: | |||
169 | 169 | ||
170 | path_patterns: | 170 | path_patterns: |
171 | bundle_resource: | 171 | bundle_resource: |
172 | - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%% | 172 | - "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%" |
173 | 173 | ||
174 | fos_user: | 174 | fos_user: |
175 | db_driver: orm | 175 | db_driver: orm |
@@ -177,9 +177,9 @@ fos_user: | |||
177 | user_class: Wallabag\UserBundle\Entity\User | 177 | user_class: Wallabag\UserBundle\Entity\User |
178 | registration: | 178 | registration: |
179 | confirmation: | 179 | confirmation: |
180 | enabled: %fosuser_confirmation% | 180 | enabled: "%fosuser_confirmation%" |
181 | from_email: | 181 | from_email: |
182 | address: %from_email% | 182 | address: "%from_email%" |
183 | sender_name: wallabag | 183 | sender_name: wallabag |
184 | fos_oauth_server: | 184 | fos_oauth_server: |
185 | db_driver: orm | 185 | db_driver: orm |
@@ -197,8 +197,8 @@ scheb_two_factor: | |||
197 | cookie_lifetime: 2592000 | 197 | cookie_lifetime: 2592000 |
198 | 198 | ||
199 | email: | 199 | email: |
200 | enabled: %twofactor_auth% | 200 | enabled: "%twofactor_auth%" |
201 | sender_email: %twofactor_sender% | 201 | sender_email: "%twofactor_sender%" |
202 | digits: 6 | 202 | digits: 6 |
203 | template: WallabagUserBundle:Authentication:form.html.twig | 203 | template: WallabagUserBundle:Authentication:form.html.twig |
204 | mailer: wallabag_user.auth_code_mailer | 204 | mailer: wallabag_user.auth_code_mailer |