Thomas Müller 15d1df055b Merge branch 'master' into display-share-owner-master ... Conflicts: apps/files_sharing/lib/cache.php		2014-02-28 14:54:10 +01: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	use SVG icons from icons.css for New file menu	2014-02-21 14:07:25 +01: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	store the share owner in a data-attribute instead of a separate span	2014-02-20 18:24:42 +01:00
upgrade.php	[Files] Use p() instead of echo	2013-02-27 21:14:15 +01:00