Georg Ehrke 65cd15ca15 fix merge conflicts		2012-06-08 11:21:55 +02:00
..
cache	add status	2012-06-01 13:47:48 +02:00
calendar	removing executable bit - again	2012-05-15 00:52:00 +02:00
categories	removing executable bit - again	2012-05-15 00:52:00 +02:00
event	removing executable bit - again	2012-05-15 00:52:00 +02:00
import	Calendar & Contacts: Store import progress in OC_Cache	2012-06-04 22:24:17 +02:00
settings	fix status	2012-05-29 13:14:05 +02:00
share	Corrected typos.	2012-06-06 11:50:49 +02:00
changeview.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
events.php	removing executable bit - again	2012-05-15 00:52:00 +02:00