Michael Gapczynski b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 ... Conflicts: apps/files_external/templates/settings.php lib/template.php		2012-06-13 15:17:46 -04:00
..
calendar.php	Calendar: remove unused markup from #controls	2012-06-11 20:34:06 +02:00
part.choosecalendar.php	fix paths to images and set height for calendar management dialog	2012-05-17 21:51:38 +02:00
part.choosecalendar.rowfields.php	Fix double sanitization	2012-06-11 19:43:37 +02:00
part.choosecalendar.rowfields.shared.php	Removed double sanitization	2012-06-11 19:47:42 +02:00
part.editcalendar.php	removed description field for calendar	2011-10-08 13:28:01 +02:00
part.editevent.php	make calendar work with movable apps	2012-04-23 20:32:55 +02:00
part.eventform.php	Removed double sanitization	2012-06-11 19:47:42 +02:00
part.import.php	Removed double sanitization	2012-06-11 19:47:42 +02:00
part.newevent.php	make calendar work with movable apps	2012-04-23 20:32:55 +02:00
part.showevent.php	Removed double sanitization	2012-06-11 19:47:42 +02:00
settings.php	Calendar: Added more explicit sync links and fixed indentation.	2012-06-07 12:21:24 +02:00
share.dropdown.php	fix paths to images and set height for calendar management dialog	2012-05-17 21:51:38 +02:00