Georg Ehrke dc18e65b46 fix merge conflicts		2012-04-15 22:26:55 +02:00
..
app.php	fix merge conflicts	2012-04-15 22:26:55 +02:00
database.xml	add sharing management for calendars	2012-02-04 21:23:31 +01:00
info.xml	keep version numbers in their own files for faster reading	2012-04-14 16:29:11 +02:00
update.php	Calendar: Correct calendarcolor format for ical color property	2012-02-21 20:10:40 +01:00
version	fix merge conflicts	2012-04-15 12:43:07 +02:00