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
..
ajax	Files, trashbin, public apps use ajax/JSON for the file list	2014-04-02 15:33:47 +02:00
appinfo	split-up the update script and add unit tests for it	2014-04-23 12:54:26 +02:00
css	Merge pull request #8255 from owncloud/fix-public-download-button	2014-04-22 15:44:29 +05:30
js	drop folder support on public shared folders	2014-04-11 14:54:13 +02:00
l10n	[tx-robot] updated from transifex	2014-04-25 01:56:28 -04:00
lib	Merge branch 'master' into type-hinting-sharing	2014-04-28 17:59:41 +02:00
templates	remove unneeded icon class	2014-03-14 14:47:40 +01:00
tests	split-up the update script and add unit tests for it	2014-04-23 12:54:26 +02:00
public.php	Removed redundant free space and upload limit in public page	2014-04-03 16:50:21 +02:00