1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-19 08:52:22 +01:00
babelouest a13e1bd28c Merge branch 'master' of https://github.com/owncloud/contacts into ldap
Conflicts:
	lib/backend/abstractbackend.php
	lib/backend/ldap.php
2014-02-27 13:51:21 -05:00
..
2014-01-26 00:40:22 +01:00
2014-01-26 00:40:22 +01:00
2014-01-26 00:40:22 +01:00
2014-01-26 00:40:22 +01:00
2014-01-26 00:40:22 +01:00