Skip to content
Commit 729210da authored by Robin Appelman's avatar Robin Appelman
Browse files

Merge branch 'master' into memcache-public 

Conflicts:
	apps/user_ldap/lib/connection.php
parents 5d456c7c d1f3f121
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