tonyair/recipe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/recipe-cms.git synced 2024-10-22 08:05:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.5' into 4

Browse Source
This commit is contained in:
Garion Herman 2019-11-18 15:07:41 +13:00
commit a3bad3b7b8
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -1,5 +1,11 @@
language: php language: php
dist: xenial
services:
- mysql
- postgresql
env: env:
global: global:
- COMPOSER_ROOT_VERSION=4.5.x-dev - COMPOSER_ROOT_VERSION=4.5.x-dev

3
composer.json
View File

@ -25,9 +25,6 @@
"project-files": [ "project-files": [
"app/src/*" "app/src/*"
], ],
"branch-alias": {
"4.x-dev": "4.5.x-dev"
},
"resources-dir": "_resources" "resources-dir": "_resources"
}, },
"config": { "config": {