Merge branch '4.5' into 4

2019-11-18 15:07:41 +13:00 · 2019-11-18 15:07:41 +13:00 · a3bad3b7b8
parent 2c16788d30 0bc11379c4
commit a3bad3b7b8
2 changed files with 7 additions and 4 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,5 +1,11 @@
 language: php

+dist: xenial
+
+services:
+  - mysql
+  - postgresql
+
 env:
  global:
    - COMPOSER_ROOT_VERSION=4.5.x-dev
--- a/composer.json
+++ b/composer.json
@ -25,9 +25,6 @@
        "project-files": [
            "app/src/*"
        ],
-        "branch-alias": {
-            "4.x-dev": "4.5.x-dev"
-        },
        "resources-dir": "_resources"
    },
    "config": {
@ -35,4 +32,4 @@
    },
    "prefer-stable": true,
    "minimum-stability": "dev"
-}
+}