diff options
Diffstat (limited to 'app/config')
-rw-r--r-- | app/config/config.yml | 1 | ||||
-rw-r--r-- | app/config/security.yml | 2 | ||||
-rw-r--r-- | app/config/wallabag.yml | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 04d757c1..0c2b6a1d 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -26,7 +26,6 @@ framework: | |||
26 | engines: ['twig'] | 26 | engines: ['twig'] |
27 | default_locale: "%locale%" | 27 | default_locale: "%locale%" |
28 | trusted_hosts: ~ | 28 | trusted_hosts: ~ |
29 | trusted_proxies: ~ | ||
30 | session: | 29 | session: |
31 | # handler_id set to null will use default session handler from php.ini | 30 | # handler_id set to null will use default session handler from php.ini |
32 | handler_id: session.handler.native_file | 31 | handler_id: session.handler.native_file |
diff --git a/app/config/security.yml b/app/config/security.yml index 796dc361..02afc9ea 100644 --- a/app/config/security.yml +++ b/app/config/security.yml | |||
@@ -12,7 +12,7 @@ security: | |||
12 | class: WallabagUserBundle:User | 12 | class: WallabagUserBundle:User |
13 | property: username | 13 | property: username |
14 | fos_userbundle: | 14 | fos_userbundle: |
15 | id: fos_user.user_provider.username | 15 | id: fos_user.user_provider.username_email |
16 | 16 | ||
17 | # the main part of the security, where you can set up firewalls | 17 | # the main part of the security, where you can set up firewalls |
18 | # for specific sections of your app | 18 | # for specific sections of your app |
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index b155d159..d2476959 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml | |||
@@ -1,5 +1,5 @@ | |||
1 | wallabag_core: | 1 | wallabag_core: |
2 | version: 2.3.2 | 2 | version: 2.3.3 |
3 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" | 3 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" |
4 | languages: | 4 | languages: |
5 | en: 'English' | 5 | en: 'English' |