Bjoern Schiessle fc76a13c52 Merge branch 'master' into sharing_mail_notification_master ... Conflicts: lib/public/share.php		2013-09-23 11:18:00 +02:00
..
files	Merge branch 'master' into sharing_mail_notification_master	2013-09-23 11:18:00 +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	remove unneccessary lib in namespace	2013-09-20 16:46:33 +02:00
files_trashbin	[tx-robot] updated from transifex	2013-09-22 12:58:42 -04: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