Skip to content
Commit 894d44e7 authored by Bart Visscher's avatar Bart Visscher
Browse files

Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git' 

Conflicts:
	lib/base.php
parents c1c76539 b2b84f3a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment