lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Browse Source 
Conflicts:
	.travis.yml
This commit is contained in:
Laurent Destailleur 2018-09-02 15:27:03 +02:00
commit f216da78d5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -63,15 +63,15 @@ matrix:
# We exclude some combinations not usefull to save Travis CPU # We exclude some combinations not usefull to save Travis CPU
exclude: exclude:
- php: '5.4' - php: '5.4'
env: DB=mysql env: DB=mariadb
- php: '5.5' - php: '5.5'
env: DB=mysql env: DB=mariadb
- php: '5.6' - php: '5.6'
env: DB=mysql env: DB=mariadb
- php: '7.0' - php: '7.0'
env: DB=mysql env: DB=mariadb
- php: '7.1' - php: '7.1'
env: DB=mysql env: DB=mariadb
- php: '5.4' - php: '5.4'
env: DB=postgresql env: DB=postgresql
- php: '5.5' - php: '5.5'