diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2021-05-13 23:20:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2021-05-13 23:20:47 +0000 |
| commit | f1fe87e2b01a5760cea11a2ee9b8ead57c91da32 (patch) | |
| tree | 0f9c278ea5e2d18b993451ebf32b32e0a113c4f0 /docs | |
| parent | 2da82db92468327ee5be44a3fde5d88a1682fcfb (diff) | |
| parent | 076b93fba0a02a53655a1ace3ca45577d58eb4a8 (diff) | |
| download | mediawikicore-f1fe87e2b01a5760cea11a2ee9b8ead57c91da32.tar.gz mediawikicore-f1fe87e2b01a5760cea11a2ee9b8ead57c91da32.zip | |
Merge "Add extension.json merge strategy "provide_default""
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/extension.schema.v1.json | 3 | ||||
| -rw-r--r-- | docs/extension.schema.v2.json | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/extension.schema.v1.json b/docs/extension.schema.v1.json index c1369b42ed16..8db1291c9d5b 100644 --- a/docs/extension.schema.v1.json +++ b/docs/extension.schema.v1.json @@ -1033,7 +1033,8 @@ "array_replace_recursive", "array_plus_2d", "array_plus", - "array_merge" + "array_merge", + "provide_default" ], "default": "array_merge" } diff --git a/docs/extension.schema.v2.json b/docs/extension.schema.v2.json index 842d509eca16..17f7b59ac3d4 100644 --- a/docs/extension.schema.v2.json +++ b/docs/extension.schema.v2.json @@ -1067,7 +1067,8 @@ "array_replace_recursive", "array_plus_2d", "array_plus", - "array_merge" + "array_merge", + "provide_default" ], "default": "array_merge" }, |