Georg Ehrke bfb67286c8 fix merge conflicts		2012-02-25 16:54:27 +01:00
..
ajax	fix merge conflicts	2012-02-25 16:54:27 +01:00
appinfo	fix merge conflicts	2012-02-25 16:54:27 +01:00
css	add sharing management for calendars	2012-02-04 21:23:31 +01:00
img	use svg icon for calendar	2012-01-15 18:29:44 +01:00
import_tmp	improve import function	2012-01-14 14:22:30 +01:00
js	fix merge conflicts	2012-02-25 16:54:27 +01:00
l10n	update translations	2012-01-27 00:59:24 +01:00
lib	fix merge conflicts	2012-02-25 16:54:27 +01:00
templates	fix merge conflicts	2012-02-25 16:54:27 +01:00
caldav.php	Derive the user principles from the owncloud users	2012-02-11 21:09:51 +01:00
export.php	use backslash n instead of a real new line	2012-01-15 00:56:11 +01:00
index.php	fix unexspected T-String in calendars index.php	2012-02-20 11:46:10 +01:00
settings.php	Change copyright notice to short form	2011-09-23 22:59:54 +02:00
share.php	add sharing management for calendars	2012-02-04 21:23:31 +01:00