Merge branch '3.3' into 3

silverstripe · Nov 17, 2019 · cfdffb3 · cfdffb3
2 parents ce45010 + d0b6181
commit cfdffb3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,8 @@ matrix:
       env: DB=MYSQL INSTALLER_VERSION=4.3.x-dev PHPUNIT_TEST=1
     - php: 7.3
       env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1 NPM_TEST=1
+    - php: 7.3
+      env: DB=MYSQL INSTALLER_VERSION=4.5.x-dev PHPUNIT_TEST=1
     - php: 7.3
       env: DB=MYSQL INSTALLER_VERSION=4.x-dev PHPUNIT_TEST=1
 

diff --git a/composer.json b/composer.json
@@ -25,9 +25,6 @@
         "squizlabs/php_codesniffer": "^3.0"
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "3.x-dev"
-        },
         "expose": [
             "client/dist",
             "client/lang",