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

..

addressbookcontroller.php

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

2014-02-27 13:51:21 -05:00

contactcontroller.php

2014

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

contactphotocontroller.php

Resize contact photo on upload. Fixes #296

2014-02-27 11:03:14 +01:00

exportcontroller.php

2014

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

groupcontroller.php

Also log errors

2014-02-05 22:48:29 +01:00

importcontroller.php

2014

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

pagecontroller.php

Remove use of %webroot%. Closes #406

2014-02-26 23:23:01 +01:00

settingscontroller.php

2014

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