Skip to content

Commit

Permalink
Merge branch '8.x-3.x' of github.com:acquia/df into 8.x-3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Brant Wynn committed Apr 18, 2019
2 parents ab2a0d5 + 15461ff commit 110c9b5
Show file tree
Hide file tree
Showing 4 changed files with 158 additions and 105 deletions.
14 changes: 7 additions & 7 deletions composer.json
Expand Up @@ -195,9 +195,9 @@
"npm-asset/fontawesome-iconpicker": "1.3.0",
"drupal/acquia_contenthub": "1.36.0",
"drupal/acquia_lift": "3.10.0",
"drupal/acsf": "1.51.0",
"drupal/address": "1.4.0",
"drupal/addtoany": "1.10.0",
"drupal/acsf": "1.53.0",
"drupal/address": "1.6.0",
"drupal/addtoany": "1.12.0",
"drupal/admin_login_path": "1.0.0",
"drupal/admin_toolbar": "1.26.0",
"drupal/adminimal_admin_toolbar": "1.9.0",
Expand All @@ -215,7 +215,7 @@
"drupal/entity_browser_block": "1.x-dev",
"drupal/entity_gallery": "1.x-dev",
"drupal/entity_usage": "2.0.0-alpha2",
"drupal/eu_cookie_compliance": "1.2.0",
"drupal/eu_cookie_compliance": "1.5.0",
"drupal/facets": "1.0.0-beta2",
"drupal/field_formatter_class": "1.1.0",
"drupal/field_group": "3.0-beta1",
Expand All @@ -228,7 +228,7 @@
"drupal/import": "2.0.0-beta2",
"drupal/leaflet": "1.4.0",
"drupal/link_class": "1.3.0",
"drupal/ip_anon": "1.2",
"drupal/ip_anon": "1.5",
"drupal/lite": "1.4.0",
"drupal/mailsystem": "4.1.0",
"drupal/material_admin": "1.0.0-alpha6",
Expand All @@ -250,7 +250,7 @@
"drupal/restui": "1.16.0",
"drupal/revision_log_default": "1.0.0",
"drupal/rules": "3.0.0-alpha4",
"drupal/samlauth": "2.0.0-alpha1",
"drupal/samlauth": "3.0.0-alpha1",
"drupal/search_api_autocomplete": "1.1.0",
"drupal/search_api_solr": "1.2.0",
"drupal/scenarios": "3.x-dev",
Expand All @@ -264,7 +264,7 @@
"drupal-composer/drupal-scaffold": "^2.0.0",
"cweagans/composer-patches": "1.x-dev as 1.6.5",
"loopindex/ckeditor-track-changes": "dev-master#a7df5c6b685385713e8aaf2df3f44c82e3bf823a",
"onelogin/php-saml": "2.13.0",
"onelogin/php-saml": "3.1.1",
"oomphinc/composer-installers-extender": "^1.1",
"phing/phing": "^2.14",
"acquia/acf": "dev-master",
Expand Down

0 comments on commit 110c9b5

Please sign in to comment.