Florin Peter c398fc59ad Merge branch 'master' into remove_unused_vars ... Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/proxy.php apps/files_encryption/lib/session.php apps/files_encryption/lib/stream.php		2013-05-29 09:21:00 +07:00
..
files	[tx-robot] updated from transifex	2013-05-29 02:10:54 +07:00
files_encryption	Merge branch 'master' into remove_unused_vars	2013-05-29 09:21:00 +07:00
files_external	[tx-robot] updated from transifex	2013-05-24 02:02:43 +07:00
files_sharing	Use the new session wrapper	2013-05-28 01:04:09 +07:00
files_trashbin	add event.preventDefault to undelete function	2013-05-27 16:37:43 +07:00
files_versions	[tx-robot] updated from transifex	2013-05-21 02:04:52 +07:00
user_ldap	[tx-robot] updated from transifex	2013-05-26 02:03:54 +07:00
user_webdavauth	[tx-robot] updated from transifex	2013-05-12 02:05:29 +07:00