diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-09-07 13:46:30 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-09-07 13:46:30 +0200 |
| commit | 7083c0a21d27e7e1bf45a9807a76844116d61fb8 (patch) | |
| tree | b72b5a0516d9114aeeccd6ecdb055ee240bda66a /app/config/config.yml | |
| parent | 44043ebe82a22470e2514d05efac324035ee809a (diff) | |
| parent | 495f83c92539444bff7dfd6cd647b7d65a74f949 (diff) | |
| download | wallabag-7083c0a21d27e7e1bf45a9807a76844116d61fb8.tar.gz wallabag-7083c0a21d27e7e1bf45a9807a76844116d61fb8.tar.zst wallabag-7083c0a21d27e7e1bf45a9807a76844116d61fb8.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'app/config/config.yml')
| -rw-r--r-- | app/config/config.yml | 1 |
1 files changed, 0 insertions, 1 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 |