Skip to content
Snippets Groups Projects
Commit adbe74dc authored by GitLab CI's avatar GitLab CI
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !6
parents 4db727fa 3fb5358d
Branches
Tags 1.0.5
1 merge request!6Merging develop into main
Pipeline #1276222 passed
......@@ -83,7 +83,7 @@ class Plugin implements PluginInterface {
$extra[$item][$path] = ['type:drupal-' . $type];
}
}
$extra[$item] += $this->readJson($item, $extra[$key], $io);
$extra[$item] = array_merge($extra[$item], $this->readJson($item, $extra[$key], $io));
$changed = TRUE;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment