Michael Gapczynski 82d81e8d39 Merge branch 'share_api' ... Conflicts: apps/contacts/lib/vcard.php apps/files/index.php lib/files.php		2012-08-19 22:29:01 -04:00
..
ajax	Merge addressbooks.	2012-08-16 00:25:32 +02:00
appinfo	Merge branch 'share_api'	2012-08-19 22:29:01 -04:00
css	Merge branch 'master' into share_api	2012-08-09 11:38:22 -04:00
img	Optimized image size	2012-08-18 13:56:04 +02:00
js	Merge branch 'share_api'	2012-08-19 22:29:01 -04:00
l10n	[tx-robot] updated from transifex	2012-08-20 02:03:51 +02:00
lib	Merge branch 'share_api'	2012-08-19 22:29:01 -04:00
templates	Merge branch 'share_api'	2012-08-19 22:29:01 -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