Georg Ehrke 65cd15ca15 fix merge conflicts		2012-06-08 11:21:55 +02:00
..
ajax	fix merge conflicts	2012-06-08 11:21:55 +02:00
appinfo	Merge branch 'master' into calendar_repeat	2012-06-01 11:40:39 +02:00
css	add sharing management for calendars	2012-02-04 21:23:31 +01:00
img	removing executable bit from various files	2012-04-30 12:05:57 +02:00
js	Merge branch 'master' into calendar_repeat	2012-06-06 10:12:11 +02:00
l10n	update translations	2012-06-06 00:29:28 +02:00
lib	Merge branch 'master' into calendar_repeat	2012-06-06 10:12:11 +02:00
templates	fix merge conflicts	2012-06-08 11:21:55 +02: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
export.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
index.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
settings.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
share.php	make calendar compatible with public.php	2012-05-07 15:48:41 +02:00