Georg Ehrke bfb67286c8 fix merge conflicts		2012-02-25 16:54:27 +01:00
..
app.php	add sharing management for calendars	2012-02-04 21:23:31 +01:00
database.xml	add sharing management for calendars	2012-02-04 21:23:31 +01:00
info.xml	Calendar: Correct calendarcolor format for ical color property	2012-02-21 20:10:40 +01:00
update.php	Calendar: Correct calendarcolor format for ical color property	2012-02-21 20:10:40 +01:00