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
..
admin.php	Fixed max upload size input field style	2014-01-23 20:50:09 +01:00
fileexists.html	simplify conflict template handling, fix reopen after ESC	2013-09-18 17:22:29 +02:00
index.php	Merge branch 'master' into pr-exceed_upload_limit_msg	2014-01-30 22:50:20 +08:00
part.breadcrumb.php	Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder	2014-01-15 13:36:14 +01:00
part.list.php	Fixed isPreviewAvailable warnings in log	2014-01-17 14:22:05 +01:00
upgrade.php	[Files] Use p() instead of echo	2013-02-27 21:14:15 +01:00