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

..

admin.php

Merge branch 'ldap' of https://github.com/owncloud/contacts into ldap

2014-05-09 14:54:49 -04:00

contacts.php

after a painful rebase

2014-05-09 14:30:14 -04:00

importdialog.html

Use p(), not echo

2014-03-25 01:16:08 +01:00