[Pkg-owncloud-commits] [php-sabredav] 56/220: 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-sabredav.

commit 70ba1b499b5f5bd116003f9c0f5d5291092b9841
Merge: 43e0770 32f34eb
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jan 25 16:28:14 2016 -0500

    Merge branch '3.1'

 CHANGELOG.md        | 19 +++++++++++++++++--
 tests/bootstrap.php |  1 +
 tests/phpunit.xml   | 13 ++++++++++---
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --cc CHANGELOG.md
index bbfb0b6,23e0d58..ce1ff7e
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,15 -1,7 +1,15 @@@
  ChangeLog
  =========
  
 +3.2.0-alpha1 (????-??-??)
 +-------------------------
 +
 +* Removed database migration script for sabre/dav 1.7. To update from that
 +  version you now first need to update to sabre/dav 3.1.
 +* Removed deprecated function: `Sabre\DAV\Auth\Plugin::getCurrentUser()`.
 +
 +
- 3.1.1 (????-??-??)
+ 3.1.1 (2016-01-25)
  ------------------
  
  * #755: The brower plugin and some operations would break when scheduling and

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