Georg Ehrke 0918fc7d91 fix merge conflicts		2012-04-21 23:21:50 +02:00
..
delete.php	fix merge conflicts	2012-04-15 12:43:07 +02:00
edit.form.php	fix merge conflicts	2012-04-21 23:21:50 +02:00
edit.php	make shared events editable and add (empty) classes for alarm and attendees	2012-04-10 16:03:38 -04:00
move.php	fix merge conflicts	2012-04-21 23:21:50 +02:00
new.form.php	fix merge conflicts	2012-04-13 16:40:10 -04:00
new.php	reuse OC_L10N objects	2012-04-14 16:44:15 +02:00
resize.php	fix merge conflicts	2012-04-21 23:21:50 +02:00