Pellaeon Lin 099b71c712 Merge branch 'master' into pr-exceed_upload_limit_msg ... Conflicts: apps/files/templates/index.php apps/files_sharing/templates/public.php		2014-01-30 22:50:20 +08:00
..
files	Merge branch 'master' into pr-exceed_upload_limit_msg	2014-01-30 22:50:20 +08:00
files_encryption	only update file cache with the unenecrypted size when the file was written	2014-01-24 16:01:00 +01:00
files_external	Merge pull request #5153 from owncloud/core-em-to-px	2014-01-27 02:29:47 -08:00
files_sharing	Merge branch 'master' into pr-exceed_upload_limit_msg	2014-01-30 22:50:20 +08:00
files_trashbin	increase size of mimetype column	2014-01-23 18:28:59 +01:00
files_versions	Merge pull request #5153 from owncloud/core-em-to-px	2014-01-27 02:29:47 -08:00
user_ldap	Merge pull request #5153 from owncloud/core-em-to-px	2014-01-27 02:29:47 -08:00
user_webdavauth	[tx-robot] updated from transifex	2014-01-04 01:55:57 -05:00