Commit b28e3b76 authored by catch's avatar catch
Browse files

Issue #3364646 by dww, catch, longwave: Add a branch alias for 11.x

parent c8deebc1

composer.json

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ 
        }

    },

    "extra": {

        "branch-alias": {

          "dev-11.x": "10.2.x-dev"

        },

        "_readme": [

            "By default Drupal loads the autoloader from ./vendor/autoload.php.",

            "To change the autoloader you can edit ./autoload.php.",

composer.lock

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",

        "This file is @generated automatically"

    ],

    "content-hash": "e98db90afbd0b05e99c667319f2f2eba",

    "content-hash": "d5d9a4f206c270584532c37f9ec140fc",

    "packages": [

        {

            "name": "asm89/stack-cors",

composer/Metapackage/CoreRecommended/composer.json

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
        "webflo/drupal-core-strict": "*"

    },

    "require": {

        "drupal/core": "11.x-dev",

        "drupal/core": "10.2.x-dev",

        "asm89/stack-cors": "~v2.1.1",

        "composer/semver": "~3.3.2",

        "doctrine/annotations": "~1.14.3",

composer/Metapackage/PinnedDevDependencies/composer.json

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
        "webflo/drupal-core-require-dev": "*"

    },

    "require": {

        "drupal/core": "11.x-dev",

        "drupal/core": "10.2.x-dev",

        "behat/mink": "v1.10.0",

        "behat/mink-browserkit-driver": "v2.1.0",

        "behat/mink-selenium2-driver": "v1.6.0",

composer/Template/LegacyProject/composer.json

+5 −5
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 
    ],

    "require": {

        "composer/installers": "^2.0",

        "drupal/core-composer-scaffold": "^11",

        "drupal/core-project-message": "^11",

        "drupal/core-recommended": "^11",

        "drupal/core-vendor-hardening": "^11"

        "drupal/core-composer-scaffold": "^10.2",

        "drupal/core-project-message": "^10.2",

        "drupal/core-recommended": "^10.2",

        "drupal/core-vendor-hardening": "^10.2"

    },

    "require-dev": {

        "drupal/core-dev": "^11"

        "drupal/core-dev": "^10.2"

    },

    "conflict": {

        "drupal/drupal": "*"