mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
nextcloud/apps/contacts
History
Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api 
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
 		2012-07-25 17:08:18 -04:00
..
ajax Remove unused ajax file. 2012-07-23 01:17:38 +02:00
appinfo Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
css Merge branch 'master' into share_api 2012-07-25 17:08:18 -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-07-25 17:08:18 -04:00
l10n update translations 2012-06-06 00:29:28 +02:00
lib Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
templates Merge branch 'master' into share_api 2012-07-25 17:08:18 -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 Code style. 2012-07-20 17:11:13 +02:00
settings.php remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
thumbnail.php Code style. 2012-07-20 17:11:13 +02:00
tmpphoto.php Code style. 2012-07-20 17:11:13 +02:00