Thomas Müller 51a6764f31 Merge branch 'master' into cleanup-list-code ... Conflicts: apps/files_sharing/ajax/list.php		2014-05-19 20:52:25 +02:00
..
files	Remove all occurences of @brief and @returns from PHPDoc	2014-05-19 17:50:53 +02:00
files_encryption	Remove all occurences of @brief and @returns from PHPDoc	2014-05-19 17:50:53 +02:00
files_external	Remove all occurences of @brief and @returns from PHPDoc	2014-05-19 17:50:53 +02:00
files_sharing	Merge branch 'master' into cleanup-list-code	2014-05-19 20:52:25 +02:00
files_trashbin	Remove all occurences of @brief and @returns from PHPDoc	2014-05-19 17:50:53 +02:00
files_versions	Remove all occurences of @brief and @returns from PHPDoc	2014-05-19 17:50:53 +02:00
user_ldap	Remove all occurences of @brief and @returns from PHPDoc	2014-05-19 17:50:53 +02:00
user_webdavauth	[tx-robot] updated from transifex	2014-05-04 01:56:15 -04:00