tonyair/silverstripe-comments
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-comments synced 2024-10-22 11:05:49 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.3' into 3

Browse Source
This commit is contained in:
Garion Herman 2019-11-18 12:13:59 +13:00
commit cfdffb394a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -13,6 +13,8 @@ matrix:
env: DB=MYSQL INSTALLER_VERSION=4.3.x-dev PHPUNIT_TEST=1 env: DB=MYSQL INSTALLER_VERSION=4.3.x-dev PHPUNIT_TEST=1
- php: 7.3 - php: 7.3
env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1 NPM_TEST=1 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 - php: 7.3
env: DB=MYSQL INSTALLER_VERSION=4.x-dev PHPUNIT_TEST=1 env: DB=MYSQL INSTALLER_VERSION=4.x-dev PHPUNIT_TEST=1

3
composer.json
View File

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