summaryrefslogtreecommitdiff
path: root/server/vendor/justinrainbow/json-schema/composer.json
diff options
context:
space:
mode:
authorArnaudVOTA <arnaud.vota@gmail.com>2016-01-27 11:04:02 +0100
committerArnaudVOTA <arnaud.vota@gmail.com>2016-01-27 11:04:02 +0100
commitb10e4679e0f0316bfe24098a84db040dcfc8d38f (patch)
tree3bdc7cb4b721a870eb9bab9696326071b1388ce6 /server/vendor/justinrainbow/json-schema/composer.json
parent5466ce78f00038e742ef2a108c755f57ede451f5 (diff)
parent81d5c2a6464771c9a180d0214706a2f65f0b1d18 (diff)
Merge remote-tracking branch 'refs/remotes/origin/master' into vota_overlay
Diffstat (limited to 'server/vendor/justinrainbow/json-schema/composer.json')
-rw-r--r--server/vendor/justinrainbow/json-schema/composer.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/vendor/justinrainbow/json-schema/composer.json b/server/vendor/justinrainbow/json-schema/composer.json
index c45891a..68b3933 100644
--- a/server/vendor/justinrainbow/json-schema/composer.json
+++ b/server/vendor/justinrainbow/json-schema/composer.json
@@ -36,7 +36,7 @@
}
}],
"require": {
- "php": ">=5.3.2"
+ "php": ">=5.3.29"
},
"require-dev": {
"json-schema/JSON-Schema-Test-Suite": "1.1.0",
@@ -52,7 +52,7 @@
"bin": ["bin/validate-json"],
"extra": {
"branch-alias": {
- "dev-master": "1.4.x-dev"
+ "dev-master": "1.6.x-dev"
}
}
}