diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-05-01 22:15:46 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-05-01 22:15:46 +0200 |
| commit | e1d64050ad6f54e45d3954ffac21daaee58c6240 (patch) | |
| tree | b75342f245905c7d17dc5af80cc5412545490d6c /composer.json | |
| parent | 3cbb0cc3ef89873a06bda6583747a2660b989fb8 (diff) | |
| parent | 9579003045970d4feed9de955fe939d4f02fe439 (diff) | |
| download | wallabag-e1d64050ad6f54e45d3954ffac21daaee58c6240.tar.gz wallabag-e1d64050ad6f54e45d3954ffac21daaee58c6240.tar.zst wallabag-e1d64050ad6f54e45d3954ffac21daaee58c6240.zip | |
Merge remote-tracking branch 'origin/master' into 2.3
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json index 5f9e6c1d..bfd42339 100644 --- a/composer.json +++ b/composer.json | |||
| @@ -115,7 +115,7 @@ | |||
| 115 | "symfony-var-dir": "var", | 115 | "symfony-var-dir": "var", |
| 116 | "symfony-web-dir": "web", | 116 | "symfony-web-dir": "web", |
| 117 | "symfony-tests-dir": "tests", | 117 | "symfony-tests-dir": "tests", |
| 118 | "symfony-assets-install": "symlink", | 118 | "symfony-assets-install": "relative", |
| 119 | "incenteev-parameters": { | 119 | "incenteev-parameters": { |
| 120 | "file": "app/config/parameters.yml" | 120 | "file": "app/config/parameters.yml" |
| 121 | } | 121 | } |