aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-01-31 15:12:18 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-01-31 15:31:34 +0100
commit48e3007b7f5b542ebd8dda07a7a206f3bce69d7a (patch)
tree265f3a79b736e1082db7c710be1e75ac53203176 /app
parenta74a6ca2b164447f2675a13840f862c2c4c672fd (diff)
downloadwallabag-48e3007b7f5b542ebd8dda07a7a206f3bce69d7a.tar.gz
wallabag-48e3007b7f5b542ebd8dda07a7a206f3bce69d7a.tar.zst
wallabag-48e3007b7f5b542ebd8dda07a7a206f3bce69d7a.zip
Fix from_email & fos_user
Diffstat (limited to 'app')
-rw-r--r--app/config/parameters.yml.dist2
-rw-r--r--app/config/tests/parameters.yml.dist.mysql2
-rw-r--r--app/config/tests/parameters.yml.dist.pgsql2
-rw-r--r--app/config/tests/parameters.yml.dist.sqlite2
4 files changed, 8 insertions, 0 deletions
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 3eeedb78..57cae9a0 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -40,3 +40,5 @@ parameters:
40 # two factor stuff 40 # two factor stuff
41 twofactor_auth: true 41 twofactor_auth: true
42 twofactor_sender: no-reply@wallabag.org 42 twofactor_sender: no-reply@wallabag.org
43
44 from_email: no-reply@wallabag.org
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index 3244fd3a..2823a424 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -30,3 +30,5 @@ parameters:
30 # two factor stuff 30 # two factor stuff
31 twofactor_auth: true 31 twofactor_auth: true
32 twofactor_sender: no-reply@wallabag.org 32 twofactor_sender: no-reply@wallabag.org
33
34 from_email: no-reply@wallabag.org
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index cee34473..5b55cb64 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -30,3 +30,5 @@ parameters:
30 # two factor stuff 30 # two factor stuff
31 twofactor_auth: true 31 twofactor_auth: true
32 twofactor_sender: no-reply@wallabag.org 32 twofactor_sender: no-reply@wallabag.org
33
34 from_email: no-reply@wallabag.org
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index a1535bc9..01589d28 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -30,3 +30,5 @@ parameters:
30 # two factor stuff 30 # two factor stuff
31 twofactor_auth: true 31 twofactor_auth: true
32 twofactor_sender: no-reply@wallabag.org 32 twofactor_sender: no-reply@wallabag.org
33
34 from_email: no-reply@wallabag.org