diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 16:41:29 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 16:41:29 +0100 |
| commit | 5a619812ca3eb05a82a023ccdaee13501eb8d45f (patch) | |
| tree | a1541999a3e13f9bb8b45d3a61320ee61aa4eb3c /src/Wallabag/UserBundle/Resources/config | |
| parent | da4136557963018287cae61226e9006c3c741747 (diff) | |
| parent | 84795d015b3c7e1af48a3dda3cb33cf080b66e8f (diff) | |
| download | wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.gz wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.zst wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'src/Wallabag/UserBundle/Resources/config')
| -rw-r--r-- | src/Wallabag/UserBundle/Resources/config/services.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml index 8062e53f..164a25ec 100644 --- a/src/Wallabag/UserBundle/Resources/config/services.yml +++ b/src/Wallabag/UserBundle/Resources/config/services.yml | |||
| @@ -6,7 +6,8 @@ services: | |||
| 6 | - "@twig" | 6 | - "@twig" |
| 7 | - "%scheb_two_factor.email.sender_email%" | 7 | - "%scheb_two_factor.email.sender_email%" |
| 8 | - "%scheb_two_factor.email.sender_name%" | 8 | - "%scheb_two_factor.email.sender_name%" |
| 9 | - "@craue_config" | 9 | - '@=service(''craue_config'').get(''wallabag_support_url'')' |
| 10 | - '@=service(''craue_config'').get(''wallabag_url'')' | ||
| 10 | 11 | ||
| 11 | wallabag_user.password_resetting: | 12 | wallabag_user.password_resetting: |
| 12 | class: Wallabag\UserBundle\EventListener\PasswordResettingListener | 13 | class: Wallabag\UserBundle\EventListener\PasswordResettingListener |