Florin Peter 499fe6ca8e disabled FileProxy in Keymanager::getPrivateKey		2013-05-15 02:36:23 +02:00
..
files	Merge branch 'master' into files_encryption	2013-05-01 09:31:26 +02:00
files_encryption	disabled FileProxy in Keymanager::getPrivateKey	2013-05-15 02:36:23 +02:00
files_external	Merge branch 'master' into files_encryption	2013-05-01 09:31:26 +02:00
files_sharing	revert changes to fbbc76f281 because master is very unstable right now	2013-05-01 01:38:06 +02:00
files_trashbin	make sure to find the correct path for shared files	2013-05-03 17:14:43 +02:00
files_versions	revert changes to fbbc76f281 because master is very unstable right now	2013-05-01 01:38:06 +02:00
user_ldap	Merge branch 'master' into files_encryption	2013-05-01 09:31:26 +02:00
user_webdavauth	[tx-robot] updated from transifex	2013-04-24 02:01:20 +02:00