Georg Ehrke 40e7b56783 Merge branch 'master' into calendar_export		2012-06-20 20:15:07 +02:00
..
app.php	Merge branch 'master' into calendar_export	2012-06-20 20:15:07 +02:00
database.xml	fix merge conflicts	2012-06-13 11:40:00 +02:00
info.xml	mark the apps as part of the shipped package and increase the requirement to ownCloud 4	2012-05-18 16:06:57 +02:00
remote.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
update.php	change some function names in OC_Calendar_Repeat	2012-06-15 11:34:21 +02:00
version	fix merge conflicts	2012-06-13 11:40:00 +02:00