Thomas Müller db39fede97 Merge branch 'master' into appframework-master ... Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php		2013-09-25 09:52:12 +02:00
..
files	Merge branch 'master' into appframework-master	2013-09-25 09:52:12 +02:00
files_encryption	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
files_external	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
files_sharing	Merge branch 'master' into appframework-master	2013-09-25 09:52:12 +02:00
files_trashbin	Merge branch 'master' into appframework-master	2013-09-25 09:52:12 +02:00
files_versions	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
user_ldap	[tx-robot] updated from transifex	2013-09-22 12:58:42 -04:00
user_webdavauth	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00