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
..
public.js	Merge branch 'master' into mobile-style	2014-01-23 00:39:11 +01:00
share.js	Fixed various file name escaping issues in core apps	2014-01-10 15:02:26 +01:00