[Pkg-owncloud-commits] [php-sabre-vobject] 85/128: Merge branch '3.1'

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabre-vobject.

commit cc641b4fdf455da08b636111b22a50fe656c1186
Merge: 3e82424 869e3c8
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Sun Mar 30 17:52:55 2014 -0400

    Merge branch '3.1'

 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --cc .travis.yml
index 3a72646,d15acbd..146175a
--- a/.travis.yml
+++ b/.travis.yml
@@@ -10,16 -9,11 +10,15 @@@ php
  
  matrix:
    allow_failures:
-     - php:
-         5.5.10
-         5.6
+     - php: 5.5.10
+     - php: 5.6
  
 +matrix:
 +    allowed_failures:
 +        - php: hhvm
 +
  script:
    - phpunit --configuration tests/phpunit.xml
 -  - php bin/vobject -h
 +  - ./bin/vobject -h
  
  before_script: composer install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git