Bart Visscher 66b1ad0a9b Merge branch 'master' into type-hinting-sharing ... Conflicts: apps/files_sharing/lib/share/file.php apps/files_sharing/tests/api.php lib/private/share/share.php		2014-04-28 17:59:41 +02:00
..
file.php	Merge branch 'master' into type-hinting-sharing	2014-04-28 17:59:41 +02:00
folder.php	Style cleanup files_sharing	2013-02-21 23:46:50 +01:00