Merge remote-tracking branch 'upstream/master'

2014-02-22 23:19:29 +07:00 · 2014-02-22 23:19:29 +07:00 · a915e05a15
parent eb6b44ef85 49d7897176
commit a915e05a15
1 changed files with 6 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -4,9 +4,12 @@ php:
  - 5.3
  - 5.4
  - 5.5
-  ## Wait for solving this issue : https://github.com/travis-ci/travis-ci/issues/1749
-  # - hhvm
-
+  ## @reference https://github.com/travis-ci/travis-ci/issues/1749
+  - hhvm
+matrix:
+  allow_failures:
+    - php: hhvm
+    
 before_script:
  ## Composer
  - curl -s http://getcomposer.org/installer | php