Skip to content
Snippets Groups Projects
Commit a81756bf authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !2
parents 9f75e6e4 247aacf6
Branches develop
Tags
1 merge request!2Merging develop into main
Pipeline #736073 passed
...@@ -13,14 +13,20 @@ ...@@ -13,14 +13,20 @@
"authors": [ "authors": [
{ {
"name": "Jürgen Haas", "name": "Jürgen Haas",
"email": "juergen@paragon-es.de", "email": "juergen.haas@lakedrops.com",
"homepage": "https://www.paragon-es.de", "homepage": "https://www.lakedrops.com",
"role": "Drupal Expert"
},
{
"name": "Daniel Speicher",
"email": "daniel.speicher@lakedrops.com",
"homepage": "https://www.lakedrops.com",
"role": "Drupal Expert" "role": "Drupal Expert"
}, },
{ {
"name": "Richard Papp", "name": "Richard Papp",
"email": "richard.papp@boromino.com", "email": "richard.papp@lakedrops.com",
"homepage": "http://www.boromino.com", "homepage": "https://www.lakedrops.com",
"role": "Drupal Expert" "role": "Drupal Expert"
} }
], ],
...@@ -44,7 +50,7 @@ ...@@ -44,7 +50,7 @@
"drupal/antibot": "^1.4", "drupal/antibot": "^1.4",
"drupal/block_class": "^1.2", "drupal/block_class": "^1.2",
"drupal/coffee": "^1.0", "drupal/coffee": "^1.0",
"drupal/colorbox": "^1.6", "drupal/colorbox": "^1.6 | ^2.0",
"drupal/config_auto_export": "^2.0", "drupal/config_auto_export": "^2.0",
"drupal/config_filter": "^2.0", "drupal/config_filter": "^2.0",
"drupal/config_split": "^2.0", "drupal/config_split": "^2.0",
...@@ -59,7 +65,7 @@ ...@@ -59,7 +65,7 @@
"drupal/gin": "^3.0@alpha", "drupal/gin": "^3.0@alpha",
"drupal/gin_toolbar": "^1.0@beta", "drupal/gin_toolbar": "^1.0@beta",
"drupal/honeypot": "^2.0", "drupal/honeypot": "^2.0",
"drupal/linkit": "^6.0", "drupal/linkit": "6.0.x-dev",
"drupal/metatag": "^1.13", "drupal/metatag": "^1.13",
"drupal/pathauto": "^1.8", "drupal/pathauto": "^1.8",
"drupal/piwik_noscript": "^1.4", "drupal/piwik_noscript": "^1.4",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment