Bart Visscher bf1057143c Merge branch 'master' into routing ... Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php		2012-09-28 15:38:49 +02:00
..
files	Merge branch 'master' into routing	2012-09-28 15:38:49 +02:00
files_encryption	[tx-robot] updated from transifex	2012-09-27 02:03:09 +02:00
files_external	check if file really exist before add/remove it	2012-09-27 12:37:23 +02:00
files_sharing	[tx-robot] updated from transifex	2012-09-28 02:06:03 +02:00
files_versions	[tx-robot] updated from transifex	2012-09-27 02:03:09 +02:00
user_ldap	LDAP: comparison, not assignment. Thanks to Manuel Delgado	2012-09-27 19:52:52 +02:00
user_webdavauth	adding space between) and {	2012-09-07 15:22:01 +02:00