[Pkg-owncloud-commits] [php-sabre-vobject] 04/11: Merge branch '2.1' into 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 869e3c8ce9e40792db336d23ca72d7a88d69728b
Merge: 2b43fe6 9892cf9
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Sun Mar 30 17:51:24 2014 -0400

    Merge branch '2.1' into 3.1

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

diff --cc .travis.yml
index 8466929,5bd1508..d15acbd
--- a/.travis.yml
+++ b/.travis.yml
@@@ -9,12 -9,9 +9,11 @@@ php
  
  matrix:
    allow_failures:
-     - php:
-         5.5.10
-         5.6
+     - php: 5.5.10
+     - php: 5.6
  
 -script: phpunit --configuration tests/phpunit.xml
 +script:
 +  - phpunit --configuration tests/phpunit.xml
 +  - php 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