Thomas Müller 5edc4c95bc Merge branch 'stable6' into backport_6777_stable6 ... Conflicts: apps/files_sharing/css/public.css apps/files_sharing/templates/public.php		2014-02-07 14:21:10 +01:00
..
files.css	fix multiselect bar being too short on big displays	2014-02-05 11:29:39 +01:00
upload.css	remove %webroot% from files app	2014-02-06 14:28:17 +01:00