Bart Visscher 4a5973662c Merge branch 'unstable' ... Conflicts: apps/files_external/tests/config.php apps/files_versions/ajax/getVersions.php apps/files_versions/appinfo/app.php apps/files_versions/history.php apps/files_versions/js/versions.js apps/files_versions/templates/history.php apps/files_versions/versions.php lib/base.php		2012-06-04 23:02:05 +02:00
..
ajax	restore require once command for non app files	2012-04-18 17:49:50 +02:00
css	move auth.css and remoteStorage-big.png to assets folders From where they can be included	2012-05-14 17:05:35 +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-05-17 00:36:21 +02:00
lostpassword	use our own serverHost call so that ownCloud works with reverse proxy servers	2012-05-31 20:26:09 +02:00
templates	Merge branch 'unstable'	2012-06-04 23:02:05 +02:00
minimizer.php	Combine and minimize core and default app js files	2012-05-16 18:53:46 +02:00
strings.php	reuse OC_L10N objects	2012-04-14 16:44:15 +02:00