Georg Ehrke afcb0aee40 fix merge conflicts		2012-04-13 16:40:10 -04:00
..
calendar	rename updatecalendar to update	2012-02-23 22:07:31 +01:00
categories	Calendar: Implement rescan of Categories	2012-04-13 21:13:58 +02:00
event	fix merge conflicts	2012-04-13 16:40:10 -04:00
import	add backslash r to the newline var	2012-03-28 17:06:16 +02:00
settings	give users the possibility to choose between monday and sunday as first day of the week	2012-02-26 21:23:20 +01:00
share	fix name of constants	2012-03-31 13:37:44 +02:00
changeview.php	fix merge conflicts	2012-02-25 16:54:27 +01:00
events.php	fix view of single shared events	2012-04-07 22:54:38 -04:00