Pellaeon Lin 099b71c712 Merge branch 'master' into pr-exceed_upload_limit_msg ... Conflicts: apps/files/templates/index.php apps/files_sharing/templates/public.php		2014-01-30 22:50:20 +08:00
..
l10n	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
private	Merge branch 'master' into pr-exceed_upload_limit_msg	2014-01-30 22:50:20 +08:00
public	Merge branch 'master' into pr-exceed_upload_limit_msg	2014-01-30 22:50:20 +08:00
autoloader.php	Allow null as cache parameter (if no cache was found) and for cache removal.	2013-10-22 11:17:15 +02:00
base.php	Merge pull request #6912 from owncloud/replace-webroot-in-css	2014-01-27 04:11:15 -08:00