Georg Ehrke 0918fc7d91 fix merge conflicts		2012-04-21 23:21:50 +02:00
..
calendar	reuse OC_L10N objects	2012-04-14 16:44:15 +02:00
categories	Calendar: Implement rescan of Categories	2012-04-13 21:13:58 +02:00
event	fix merge conflicts	2012-04-21 23:21:50 +02:00
import	fix merge conflicts	2012-04-21 22:12:31 +02:00
settings	reuse OC_L10N objects	2012-04-14 16:44:15 +02:00
share	implement shared calendar activation on server side	2012-04-18 11:50:12 +02:00
changeview.php	fix merge conflicts	2012-02-25 16:54:27 +01:00
events.php	fix merge conflicts	2012-04-21 23:21:50 +02:00