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

..

addressbookcontroller.php

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

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

contactcontroller.php

camelCase variables

2014-03-18 00:58:01 +01:00

contactphotocontroller.php

Add to CacheThumbnail call

2014-03-21 15:19:32 +01:00

exportcontroller.php

2014

2014-01-26 00:40:22 +01:00

groupcontroller.php

Scrutinizer cleanup

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

importcontroller.php

Merge pull request #444 from owncloud/import_multi_format2

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

pagecontroller.php

camelCase variables

2014-03-18 00:58:01 +01:00

settingscontroller.php

2014

2014-01-26 00:40:22 +01:00