[Pkg-owncloud-commits] [php-sabredav] 102/275: Merge branch '2.0'

[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-sabredav.

commit e0313226bd057f656f92c7a1be9c2453fa57cfa0
Merge: 60e75c0 f2b70fa
Author: Evert Pot <me at evertpot.com>
Date:   Tue Jul 22 15:49:06 2014 -0400

    Merge branch '2.0'
    
    Conflicts:
    	ChangeLog.md
    	lib/DAV/Version.php

 ChangeLog.md                   | 7 +++++++
 examples/addressbookserver.php | 1 +
 examples/calendarserver.php    | 2 ++
 3 files changed, 10 insertions(+)

diff --cc ChangeLog.md
index b26e459,cadaecf..92c677c
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,17 -1,11 +1,23 @@@
  ChangeLog
  =========
  
 +2.1.0-alpha1 (2014-??-??)
 +-------------------------
 +
 +* Changed: PropertyStorage backends now have a `move` method.
 +* Added: `beforeMove`, and `afterMove` events.
 +* #460: PropertyStorage must move properties during MOVE requests
 +* Changed: Restructured the zip distribution to be a little bit more lean
 +  and consistent.
 +* #472: Always returning lock tokens in the lockdiscovery property.
 +
 +
+ 2.0.4 (????-??-??)
+ ------------------
+ 
+ * #483: typo in calendars creation for PostgreSQL.
+ 
++
  2.0.3 (2014-07-14)
  ------------------
  

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