Merge branch 'master' into dev
continuous-integration/drone/push Build is passing Details

This commit is contained in:
naomi 2022-06-06 12:03:09 +01:00
commit 17a6cc9da8
2 changed files with 407 additions and 147 deletions

View File

@ -20,10 +20,15 @@
"type": "vcs", "type": "vcs",
"url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/opencase.git" "url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/opencase.git"
},{
"type": "vcs",
"url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/bartik_gno.git"
} }
], ],
"require": { "require": {
"autonomic/goodnightout_opencase": "dev-dev", "autonomic/bartik_gno": "dev-main",
"autonomic/goodnightout_opencase": "dev-master",
"autonomic/opencase": "dev-master", "autonomic/opencase": "dev-master",
"composer/installers": "^1.2", "composer/installers": "^1.2",
"drupal/admin_toolbar": "^3.1", "drupal/admin_toolbar": "^3.1",
@ -36,6 +41,7 @@
"drupal/core-recommended": "^9", "drupal/core-recommended": "^9",
"drupal/csv_serialization": "^2.0", "drupal/csv_serialization": "^2.0",
"drupal/ctools": "^3.7", "drupal/ctools": "^3.7",
"drupal/custom_breadcrumbs": "^1.0",
"drupal/date_popup": "^1.1", "drupal/date_popup": "^1.1",
"drupal/dbug": "^2.0", "drupal/dbug": "^2.0",
"drupal/devel_entity_updates": "^3.0", "drupal/devel_entity_updates": "^3.0",
@ -56,6 +62,7 @@
"drupal/views_aggregator": "^2.0", "drupal/views_aggregator": "^2.0",
"drupal/views_autosubmit": "^1.4", "drupal/views_autosubmit": "^1.4",
"drupal/views_data_export": "^1.1", "drupal/views_data_export": "^1.1",
"drupal/views_natural_sort": "^2.0@alpha",
"drupal/views_summarize": "1.1.x-dev", "drupal/views_summarize": "1.1.x-dev",
"drush/drush": "*" "drush/drush": "*"
}, },

545
composer.lock generated

File diff suppressed because it is too large Load Diff