Georg Ehrke 2c8a61ae9c Merge branch 'master' into oc_error		2012-06-15 20:48:37 +02:00
..
ajax	restore require once command for non app files	2012-04-18 17:49:50 +02:00
css	Merge branch 'master' into oc_error	2012-06-06 10:12:54 +02:00
img	oc-657: icons for M$ office file types	2012-05-21 09:35:31 +02:00
js	fix potential xss in multiselect	2012-06-09 15:07:16 +02:00
l10n	update translations	2012-06-06 00:29:28 +02:00
lostpassword	urlencode link fort password reset (bug #970)	2012-06-13 17:22:28 +02:00
templates	Merge branch 'master' into oc_error	2012-06-15 20:48:37 +02:00
minimizer.php	Load apps before minimizing the core css and js	2012-06-04 23:17:50 +02:00
strings.php	reuse OC_L10N objects	2012-04-14 16:44:15 +02:00