[Pkg-owncloud-commits] [php-sabredav] 53/64: Merge branch '2.1'

[David Prévot]

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

taffit pushed a commit to tag 2.2.0alpha1
in repository php-sabredav.

commit a9050a5197ce966310e233b47f9fd53cb624c522
Merge: e04d5e6 e511464
Author: Evert Pot <me at evertpot.com>
Date:   Tue Dec 2 17:38:03 2014 -0500

    Merge branch '2.1'
    
    Conflicts:
    	ChangeLog.md

 ChangeLog.md               | 3 ++-
 lib/DAV/Browser/Plugin.php | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --cc ChangeLog.md
index 1babb64,52056ed..38981bf
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -36,8 -9,8 +36,9 @@@ ChangeLo
    migration.
  * #567: Doing freebusy requests on accounts that had 0 calendars would throw
    a `E_NOTICE`.
 +* #572: `HEAD` requests trigger a PHP warning.
- 
+ * #579: Browser plugin can throw exception for a few resourcetypes that didn't
+   have an icon defined.
  
  
  2.1.1 (2014-11-22)

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