babelouest 440fce7ca8 Merge branch 'master' of https://github.com/owncloud/contacts into ldap ...

Conflicts:
	formats/backend_ldap_connector.xml
	lib/backend/abstractbackend.php
	lib/backend/database.php
	lib/backend/ldap.php
	lib/controller/addressbookcontroller.php

2014-03-28 10:39:25 -04:00

..

app.php

Add missing backslash to injected class

2014-03-18 00:56:57 +01:00

database.xml

Add indexes for speedingup db queries

2013-12-20 11:50:13 +01:00

info.xml

Add missing CardDAV routes. Refs #230

2013-10-24 11:43:21 +02:00

migrate.php

Fix migration provider

2013-12-20 11:51:26 +01:00

remote.php

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

2014-03-28 10:39:25 -04:00

routes.php

Merge pull request #444 from owncloud/import_multi_format2

2014-03-23 14:18:48 +01:00

update.php

Scrutinizer cleanup

2014-03-08 16:22:51 +01:00

version

Add indexes for speedingup db queries

2013-12-20 11:50:13 +01:00