Georg Ehrke f43fd1765e fix merge conflicts		2012-06-08 11:23:58 +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	only check our own input fields when determining to show the login button	2012-05-17 01:17:44 +02:00
l10n	update translations	2012-06-06 00:29:28 +02:00
lostpassword	Remove old internal mail call for password reset, fixes bug oc-934	2012-06-07 09:25:50 -04:00
templates	fix merge conflicts	2012-06-08 11:23:58 +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