Björn Schießle f151376ad5 remove remaining line from merge conflict		2012-10-27 17:06:13 +02:00
..
files	Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'	2012-10-27 16:33:10 +02:00
files_encryption	NoSpaceAfterComma II	2012-10-23 23:01:10 +02:00
files_external	[tx-robot] updated from transifex	2012-10-27 00:02:05 +02:00
files_sharing	[tx-robot] updated from transifex	2012-10-27 00:02:05 +02:00
files_versions	remove remaining line from merge conflict	2012-10-27 17:06:13 +02:00
user_ldap	LDAP: let result processing in Access::search slice the array for not-paginated search. getUsers e.g. does not need to take care of it anymore. adjustments in group_ldap to follow.	2012-10-27 12:19:08 +02:00
user_webdavauth	Codestyle: FunctionCallArgumentSpacing	2012-10-23 08:35:54 +02:00