Thomas Müller 9019ad550f Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename ... Conflicts: apps/files/js/filelist.js		2013-10-22 23:06:53 +02:00
..
files	Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename	2013-10-22 23:06:53 +02:00
files_encryption	[tx-robot] updated from transifex	2013-10-21 13:03:32 -04:00
files_external	Added missing "grid" class on external storage's table	2013-10-14 14:02:39 +02:00
files_sharing	Merge pull request #5424 from owncloud/sharing-directlink	2013-10-21 08:26:51 -07:00
files_trashbin	[tx-robot] updated from transifex	2013-10-19 08:27:13 -04:00
files_versions	Disable versions app JS in public mode	2013-10-17 21:04:18 +02:00
user_ldap	introduce link_to_docs() and migrate links	2013-10-21 21:29:45 +02:00
user_webdavauth	[tx-robot] updated from transifex	2013-10-16 00:31:48 -04:00