Georg Ehrke fc632b5795 fix merge conflicts		2012-06-16 09:48:07 +02:00
..
calendar	fix merge conflicts	2012-06-16 09:48:07 +02:00
categories	fix merge conflicts	2012-06-16 09:48:07 +02:00
event	fix merge conflicts	2012-06-16 09:48:07 +02:00
import	fix merge conflicts	2012-06-16 09:48:07 +02:00
settings	fix merge conflicts	2012-06-16 09:48:07 +02:00
share	Corrected typos.	2012-06-06 11:49:45 +02:00
changeview.php	remove a closing php tag in calendar	2012-06-16 09:40:32 +02:00
events.php	show username of the body who shares in the summary	2012-06-13 22:07:30 +02:00