Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Ivan Lanin 2014-02-22 23:19:29 +07:00
commit a915e05a15

View File

@ -4,9 +4,12 @@ php:
- 5.3 - 5.3
- 5.4 - 5.4
- 5.5 - 5.5
## Wait for solving this issue : https://github.com/travis-ci/travis-ci/issues/1749 ## @reference https://github.com/travis-ci/travis-ci/issues/1749
# - hhvm - hhvm
matrix:
allow_failures:
- php: hhvm
before_script: before_script:
## Composer ## Composer
- curl -s http://getcomposer.org/installer | php - curl -s http://getcomposer.org/installer | php