1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-07 22:46:16 +01:00
OwncloudContactsOfficial/lib/controller
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
..
addressbookcontroller.php Merge branch 'master' of https://github.com/owncloud/contacts into ldap 2014-04-11 07:56:06 -04:00
backendcontroller.php after a painful rebase 2014-05-09 14:30:14 -04:00
contactcontroller.php use ocdialog 2014-04-07 19:40:21 -04:00
contactphotocontroller.php Simplify cropPhoto args 2014-04-17 17:38:01 +02:00
exportcontroller.php 2014 2014-01-26 00:40:22 +01:00
groupcontroller.php Align controllers to owncloud/core#8017 2014-04-07 22:29:24 +02:00
importcontroller.php Add use OCP\ICache to ImportController 2014-04-18 02:00:17 +02:00
pagecontroller.php Merge branch 'ldap' of https://github.com/owncloud/contacts into ldap 2014-05-09 14:54:49 -04:00
settingscontroller.php Align controllers to owncloud/core#8017 2014-04-07 22:29:24 +02:00