Merge branch 'master' of github.com:yiisoft/yii2 into mongo

1a31b238 · Paul Klimov · ee0c9ed6 · dc79c8c1 · 1a31b238 · 1a31b238
Commit 1a31b238 authored Nov 28, 2013 by Paul Klimov
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

.travis.yml .travis.yml +1 -1

phpunit.xml.dist phpunit.xml.dist +0 -0

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ before_script:
  - tests/unit/data/travis/sphinx-setup.sh

 #script:
-#  - phpunit --coverage-clover tests/unit/runtime/coveralls/clover.xml --verbose --exclude-group mssql,oci,wincache,xcache,zenddata,vendor,sphinx
+#  - phpunit --coverage-clover tests/unit/runtime/coveralls/clover.xml --verbose --exclude-group mssql,oci,wincache,xcache,zenddata,vendor

 #after_script:
 #  - php vendor/bin/coveralls
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist