gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_1'

Browse Source 
Conflicts:
	.travis.yml
This commit is contained in:
Michal Čihař 2013-12-09 08:39:40 +01:00
commit 47ac042879
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -14,6 +14,6 @@ before_script:
script:
- ./scripts/generate-mo --quiet
- ant phpunit lint
- if [[ $TRAVIS_PULL_REQUEST != "false" ]] ; then ./scripts/check-dco origin/master..FETCH_HEAD ; fi
- if [[ $TRAVIS_PULL_REQUEST != "false" ]] ; then ./scripts/check-dco origin/$TRAVIS_BRANCH..FETCH_HEAD ; fi
after_script:
- php vendor/bin/coveralls -v