Skip to content
Snippets Groups Projects
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
Loading
Showing
with 1364 additions and 201 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment