Thomas Müller f950ce82ae Merge branch 'master' into mobile-style ... Conflicts: apps/files/js/files.js apps/files_sharing/css/public.css apps/files_sharing/js/public.js apps/files_sharing/templates/public.php		2014-01-23 00:39:11 +01:00
..
authenticate.php	Fix password screen for public shares	2013-10-07 17:38:27 +02:00
part.404.php	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
public.php	Merge branch 'master' into mobile-style	2014-01-23 00:39:11 +01:00