Thomas Müller 840e96cda3 Merge branch 'master' into disable-anon-upload-master ... Conflicts: settings/templates/admin.php		2013-07-22 11:55:20 +02:00
..
files	Merge branch 'master' into disable-anon-upload-master	2013-07-22 11:36:52 +02:00
files_encryption	[tx-robot] updated from transifex	2013-07-22 02:03:23 -04:00
files_external	Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3	2013-07-22 02:19:27 -07:00
files_sharing	Merge branch 'master' into disable-anon-upload-master	2013-07-22 11:36:52 +02:00
files_trashbin	[tx-robot] updated from transifex	2013-07-14 02:10:41 +02:00
files_versions	fix array access and change variable names according to the coding style	2013-07-12 11:25:40 +02:00
user_ldap	[tx-robot] updated from transifex	2013-07-22 02:03:23 -04:00
user_webdavauth	[tx-robot] updated from transifex	2013-07-22 02:03:23 -04:00