diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-06-23 11:47:46 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-06-23 11:47:46 +0200 |
| commit | f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4 (patch) | |
| tree | 156b1a29cfbe1962e68d409c3dea5a3911a34e9c /app/config/config_prod.yml | |
| parent | 49e2854d5c15bbce3f24f91da34450e8f209295b (diff) | |
| parent | fb5c17a9ab5e10b1de9caa50e73638fdae19cb78 (diff) | |
| download | wallabag-f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4.tar.gz wallabag-f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4.tar.zst wallabag-f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4.zip | |
Merge branch 'master' into 2.1
Diffstat (limited to 'app/config/config_prod.yml')
| -rw-r--r-- | app/config/config_prod.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 342837a0..65b040cc 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml | |||
| @@ -2,8 +2,8 @@ imports: | |||
| 2 | - { resource: config.yml } | 2 | - { resource: config.yml } |
| 3 | 3 | ||
| 4 | #framework: | 4 | #framework: |
| 5 | # validation: | 5 | # cache: |
| 6 | # cache: apc | 6 | # system: cache.adapter.apcu |
| 7 | 7 | ||
| 8 | #doctrine: | 8 | #doctrine: |
| 9 | # orm: | 9 | # orm: |