diff options
author | ArthurHoaro <arthur@hoa.ro> | 2019-08-03 09:54:11 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2019-08-03 09:54:11 +0200 |
commit | 58fa1a6ad1596c0b5425a48ca79f71d3791f6a92 (patch) | |
tree | b50e27e0fc8ffef43edd8c8bf97e5d966f0b098c /composer.json | |
parent | ed3365325d231e044dedc32608fde87b1b39fa34 (diff) | |
parent | 3a52dfcc5c5d6de08bb6e9b16ea7033408184bef (diff) | |
download | Shaarli-58fa1a6ad1596c0b5425a48ca79f71d3791f6a92.tar.gz Shaarli-58fa1a6ad1596c0b5425a48ca79f71d3791f6a92.tar.zst Shaarli-58fa1a6ad1596c0b5425a48ca79f71d3791f6a92.zip |
Merge branch 'master' into v0.11
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/composer.json b/composer.json index c23b8252..109d5d7b 100644 --- a/composer.json +++ b/composer.json | |||
@@ -11,11 +11,11 @@ | |||
11 | "keywords": ["bookmark", "link", "share", "web"], | 11 | "keywords": ["bookmark", "link", "share", "web"], |
12 | "config": { | 12 | "config": { |
13 | "platform": { | 13 | "platform": { |
14 | "php": "5.6.31" | 14 | "php": "7.1.29" |
15 | } | 15 | } |
16 | }, | 16 | }, |
17 | "require": { | 17 | "require": { |
18 | "php": ">=5.6", | 18 | "php": ">=7.1", |
19 | "ext-json": "*", | 19 | "ext-json": "*", |
20 | "ext-zlib": "*", | 20 | "ext-zlib": "*", |
21 | "shaarli/netscape-bookmark-parser": "^2.1", | 21 | "shaarli/netscape-bookmark-parser": "^2.1", |