Skip to content
Snippets Groups Projects
Commit 54b69d41 authored by catch's avatar catch
Browse files

Issue #3526117 by phenaproxima: Conflict with Project Browser <2.1 and Automatic Updates <4

(cherry picked from commit b8089d1a)
parent db5e7aee
No related branches found
No related tags found
2 merge requests!12462Issue #3523109 by ghost of drupal past, donquixote, nicxvan, dww, larowlan,...,!12357Issue #3529639 by mradcliffe, smustgrave, solomon.yifru: replacing a depricated css
Pipeline #509075 passed with warnings
Pipeline: drupal

#509094

    Pipeline: drupal

    #509091

      Pipeline: drupal

      #509078

        ......@@ -497,7 +497,7 @@
        "dist": {
        "type": "path",
        "url": "core",
        "reference": "3806cfdbb344a5c7ed6e8b78534454547ccd882a"
        "reference": "9a3b93d8f495d3f101bcc2d39ce91695b57aece6"
        },
        "require": {
        "asm89/stack-cors": "^2.3",
        ......@@ -550,6 +550,8 @@
        "twig/twig": "^3.21.0"
        },
        "conflict": {
        "drupal/automatic_updates": "<4",
        "drupal/project_browser": "<2.1",
        "drush/drush": "<12.4.3"
        },
        "replace": {
        ......
        ......@@ -54,6 +54,8 @@
        "php-tuf/composer-stager": "^2.0"
        },
        "conflict": {
        "drupal/automatic_updates": "<4",
        "drupal/project_browser": "<2.1",
        "drush/drush": "<12.4.3"
        },
        "replace": {
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment