Georg Ehrke 1a57d392e9 Merge branch 'master' into subadmin		2012-07-18 14:51:52 +02:00
..
ajax	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
css	Merge branch 'master' into oc_error	2012-06-26 14:17:32 +02:00
img	oc-657: icons for M$ office file types	2012-05-21 09:35:31 +02:00
js	Fix time formatting for minutes, prepend 0 if minutes is less than 10	2012-07-06 16:38:54 -04: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 subadmin	2012-07-18 14:51:52 +02:00
minimizer.php	Use TemplateLayout functions for finding js and css files in minimizer	2012-06-18 15:40:48 +02:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00