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	move calendar settings from personal settings to in app settings	2012-08-09 12:37:26 +02:00
appinfo	Merge branch 'share_api'	2012-08-19 22:29:01 -04:00
css	increase margin top of calendar import's color picker	2012-08-17 20:48:47 +02:00
img	Optimized image size	2012-08-18 13:56:04 +02:00
js	Merge branch 'master' into share_api	2012-08-09 11:38:22 -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 'master' into share_api	2012-08-14 10:22:13 -04:00
caldav.php	add caldav and carddav files in their old place for backward compatibility - add rewriterule for caldav and carddav	2012-05-16 21:05:15 +02:00
calendar.php	move calendar settings from personal settings to in app settings	2012-08-09 12:37:26 +02:00
export.php	Calendar Export: replace spaces with dashes in the name of the calendar / event	2012-06-28 19:04:14 +02:00
index.php	remove debug code from calendar - thanks michael for pointing that out :)	2012-08-09 17:39:16 +02:00
settings.php	move calendar settings from personal settings to in app settings	2012-08-09 12:37:26 +02:00
share.php	fix for previous commit	2012-06-28 19:13:43 +02:00