Merge branch 'QA_4_6' into QA_4_6-security

2016-07-12 10:42:47 +02:00 · 2016-07-12 10:42:47 +02:00 · 2090eb57aa
commit 2090eb57aa
parent 8b5cafc9f3 c0450b2915
1 changed files with 0 additions and 8 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -56,14 +56,6 @@ after_script:
  - codecov
  - if [ -f php.log ] ; then cat php.log ; fi

-matrix:
-  allow_failures:
-    - php: 5.6
-      env: PHPUNIT_ARGS="--group selenium" SELENIUM="yes"
-  fast_finish: true
-  include:
-    - php: 5.6
-      env: PHPUNIT_ARGS="--group selenium" SELENIUM="yes"
 cache:
  directories:
    - $HOME/.composer/cache/