Brice Maron e5c56b2433 Merge branch 'master' into multi_app_dir ... Conflicts: lib/app.php lib/base.php lib/minimizer/css.php lib/minimizer/js.php lib/template.php lib/util.php		2012-06-21 17:15:35 +00:00
..
ajax	fix calendar	2012-06-21 16:24:05 +02:00
appinfo	Merge branch 'master' into multi_app_dir	2012-06-21 17:15:35 +00: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-20 20:14:08 +02:00
l10n	update translations	2012-06-06 00:29:28 +02:00
lib	fix a PHP Notice	2012-06-21 15:20:15 +02:00
templates	fix merge conflicts	2012-06-15 11:48:26 +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	Only create new calendar when there are none. Fix oc-1007.	2012-06-15 01:55:02 +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