Skip to content
GitLab
Explore
Sign in
Commit
729210da
authored
Jan 15, 2014
by
Robin Appelman
Browse files
Merge branch 'master' into memcache-public
Conflicts: apps/user_ldap/lib/connection.php
parents
5d456c7c
d1f3f121
Changes
61
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