Georg Ehrke bfb67286c8 fix merge conflicts		2012-02-25 16:54:27 +01:00
..
calendar	rename updatecalendar to update	2012-02-23 22:07:31 +01:00
event	add moved files to clean up ajax folder	2012-02-23 21:58:39 +01:00
import	add moved files to clean up ajax folder	2012-02-23 21:58:39 +01:00
settings	add moved files to clean up ajax folder	2012-02-23 21:58:39 +01:00
share	add moved files to clean up ajax folder	2012-02-23 21:58:39 +01:00
changeview.php	fix merge conflicts	2012-02-25 16:54:27 +01:00
events.php	fix merge conflicts	2012-02-25 16:54:27 +01:00