Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

2014-11-02 14:59:32 +01:00 · 2014-11-02 14:59:32 +01:00 · 2b6833d87e
commit 2b6833d87e
parent 026c31fab6 b1510fc535
1 changed files with 2 additions and 0 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -79,6 +79,8 @@ matrix:
  allow_failures:
    - php: 5.5
      env: PHPUNIT_ARGS="--group selenium" SELENIUM="yes"
+    - php: hhvm
+      env: PHPUNIT_ARGS="--exclude-group selenium"
  fast_finish: true
  include:
    - php: 5.5