Merge branch '1.10'
commit
08ad53f9fb
|
@ -377,13 +377,13 @@
|
||||||
"type": ["object", "array"],
|
"type": ["object", "array"],
|
||||||
"description": "A set of additional repositories where packages can be found.",
|
"description": "A set of additional repositories where packages can be found.",
|
||||||
"additionalProperties": {
|
"additionalProperties": {
|
||||||
"oneOf": [
|
"anyOf": [
|
||||||
{ "$ref": "#/definitions/repository" },
|
{ "$ref": "#/definitions/repository" },
|
||||||
{ "type": "boolean", "enum": [false] }
|
{ "type": "boolean", "enum": [false] }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"items": {
|
"items": {
|
||||||
"oneOf": [
|
"anyOf": [
|
||||||
{ "$ref": "#/definitions/repository" },
|
{ "$ref": "#/definitions/repository" },
|
||||||
{
|
{
|
||||||
"type": "object",
|
"type": "object",
|
||||||
|
@ -652,7 +652,7 @@
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"oneOf": [
|
"anyOf": [
|
||||||
{ "$ref": "#/definitions/composer-repository" },
|
{ "$ref": "#/definitions/composer-repository" },
|
||||||
{ "$ref": "#/definitions/vcs-repository" },
|
{ "$ref": "#/definitions/vcs-repository" },
|
||||||
{ "$ref": "#/definitions/path-repository" },
|
{ "$ref": "#/definitions/path-repository" },
|
||||||
|
|
Loading…
Reference in New Issue