1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-30 19:52:17 +01:00
babelouest c682a3585d Merge branch 'ldap' of https://github.com/owncloud/contacts into ldap
Conflicts:
	admin.php
	lib/backend/ldap.php
	lib/dispatcher.php
2014-05-09 14:54:49 -04:00
..
2014-03-08 09:06:05 +01:00
2014-05-09 11:29:21 +02:00
2014-03-14 14:56:57 +01:00