Skip to content
GitLab
Explore
Sign in
Commit
c62dc4fa
authored
Sep 30, 2013
by
Thomas Müller
Browse files
Merge branch 'master' into fixing-4011-master
Conflicts: lib/connector/sabre/directory.php
parents
fdc87eae
ebb2278a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment