diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-06-23 11:47:46 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-06-23 11:47:46 +0200 |
| commit | f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4 (patch) | |
| tree | 156b1a29cfbe1962e68d409c3dea5a3911a34e9c /app/config/config.yml | |
| parent | 49e2854d5c15bbce3f24f91da34450e8f209295b (diff) | |
| parent | fb5c17a9ab5e10b1de9caa50e73638fdae19cb78 (diff) | |
| download | wallabag-f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4.tar.gz wallabag-f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4.tar.zst wallabag-f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4.zip | |
Merge branch 'master' into 2.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 c371cf73..29847820 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
| @@ -156,7 +156,7 @@ liip_theme: | |||
| 156 | 156 | ||
| 157 | path_patterns: | 157 | path_patterns: |
| 158 | bundle_resource: | 158 | bundle_resource: |
| 159 | - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%% | 159 | - "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%" |
| 160 | 160 | ||
| 161 | fos_user: | 161 | fos_user: |
| 162 | db_driver: orm | 162 | db_driver: orm |
| @@ -164,9 +164,9 @@ fos_user: | |||
| 164 | user_class: Wallabag\UserBundle\Entity\User | 164 | user_class: Wallabag\UserBundle\Entity\User |
| 165 | registration: | 165 | registration: |
| 166 | confirmation: | 166 | confirmation: |
| 167 | enabled: %fosuser_confirmation% | 167 | enabled: "%fosuser_confirmation%" |
| 168 | from_email: | 168 | from_email: |
| 169 | address: %from_email% | 169 | address: "%from_email%" |
| 170 | sender_name: wallabag | 170 | sender_name: wallabag |
| 171 | fos_oauth_server: | 171 | fos_oauth_server: |
| 172 | db_driver: orm | 172 | db_driver: orm |
| @@ -184,8 +184,8 @@ scheb_two_factor: | |||
| 184 | cookie_lifetime: 2592000 | 184 | cookie_lifetime: 2592000 |
| 185 | 185 | ||
| 186 | email: | 186 | email: |
| 187 | enabled: %twofactor_auth% | 187 | enabled: "%twofactor_auth%" |
| 188 | sender_email: %twofactor_sender% | 188 | sender_email: "%twofactor_sender%" |
| 189 | digits: 6 | 189 | digits: 6 |
| 190 | template: WallabagUserBundle:Authentication:form.html.twig | 190 | template: WallabagUserBundle:Authentication:form.html.twig |
| 191 | mailer: wallabag_user.auth_code_mailer | 191 | mailer: wallabag_user.auth_code_mailer |