Björn Schießle 5cd14425f9 Merge branch 'master' into files_encryption ... Conflicts: apps/files_trashbin/l10n/nn_NO.php		2013-05-21 15:30:19 +02:00
..
files	[tx-robot] updated from transifex	2013-05-21 02:04:52 +02:00
files_encryption	fix path to 3rdparty apps	2013-05-21 12:33:32 +02:00
files_external	[tx-robot] updated from transifex	2013-05-20 02:10:11 +02:00
files_sharing	[tx-robot] updated from transifex	2013-05-21 02:04:52 +02:00
files_trashbin	Merge branch 'master' into files_encryption	2013-05-21 15:30:19 +02:00
files_versions	[tx-robot] updated from transifex	2013-05-21 02:04:52 +02:00
user_ldap	[tx-robot] updated from transifex	2013-05-21 02:04:52 +02:00
user_webdavauth	[tx-robot] updated from transifex	2013-05-12 02:05:29 +02:00