babelouest 229c49d43e Merge branch 'master' of https://github.com/owncloud/contacts into import-new-ui ...

Conflicts:
	js/addressbooks.js
	templates/contacts.php

2014-05-10 12:09:23 -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

Merge branch 'master' of https://github.com/owncloud/contacts into import-new-ui

2014-05-10 12:09:23 -04:00

importdialog.html

Use p(), not echo

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