nextcloud/apps/contacts
Michael Gapczynski 4c7fd8cd01 Merge branch 'master' into share_api
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
2012-08-14 10:22:13 -04:00
..
ajax Used wrong class. 2012-08-10 01:39:05 +02:00
appinfo Merge branch 'master' into share_api 2012-08-14 10:22:13 -04:00
css Merge branch 'master' into share_api 2012-08-09 11:38:22 -04:00
img Contacts: Resized Add button. Now how do I add a gradient? ;-) 2012-05-06 13:51:16 +02:00
js Merge branch 'master' into share_api 2012-08-14 10:22:13 -04:00
l10n [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
lib Contacts: Check format parameter 2012-08-10 14:40:43 +02:00
templates Merge branch 'master' into share_api 2012-08-14 10:22:13 -04:00
carddav.php Code style. 2012-07-20 17:11:13 +02:00
export.php Code style. 2012-07-20 17:11:13 +02:00
import.php Code style. 2012-07-20 17:11:13 +02:00
index.php Code style. 2012-07-20 17:11:13 +02:00
photo.php Another take at profile photo/thumbnail caching. oc-839. 2012-08-09 16:32:05 +02:00
settings.php Implemented app settings in popup. 2012-07-31 12:23:22 +02:00
thumbnail.php Another take at profile photo/thumbnail caching. oc-839. 2012-08-09 16:32:05 +02:00
tmpphoto.php Code style. 2012-07-20 17:11:13 +02:00