aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-01-23 20:29:32 +0100
committerJeremy Benoist <j0k3r@users.noreply.github.com>2016-01-23 20:29:32 +0100
commit95780f5abe776bdeec3bc78eb3257f7682bb0bf6 (patch)
tree6fb319a9f75f9215e487b634b833b62af98b67f6
parent96fcb60c335a8985d0ebb8acec3af7c310edb70c (diff)
parenta40dd9896b6c96834fe5d0e99fb471827f3ba47d (diff)
downloadwallabag-95780f5abe776bdeec3bc78eb3257f7682bb0bf6.tar.gz
wallabag-95780f5abe776bdeec3bc78eb3257f7682bb0bf6.tar.zst
wallabag-95780f5abe776bdeec3bc78eb3257f7682bb0bf6.zip
Merge pull request #1625 from wallabag/v2-fix-1621
[#1621] Add default address for FosUser
-rw-r--r--app/config/config.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 23262469..5d9c7c55 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -181,7 +181,9 @@ fos_user:
181 registration: 181 registration:
182 confirmation: 182 confirmation:
183 enabled: true 183 enabled: true
184 184 from_email:
185 address: %from_email%
186 sender_name: wallabag
185fos_oauth_server: 187fos_oauth_server:
186 db_driver: orm 188 db_driver: orm
187 client_class: Wallabag\ApiBundle\Entity\Client 189 client_class: Wallabag\ApiBundle\Entity\Client