Arthur Schiwon 1a020e0696 Resolve merge conflict		2013-09-27 13:34:15 +02:00
..
ajax	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
appinfo	merge master into backgroundjob	2013-06-02 20:12:44 +02:00
css	Merge pull request #4497 from owncloud/newlines_at_eof_kondou	2013-08-18 07:16:15 -07:00
js	Merge pull request #4262 from owncloud/fix_jslint_kondou	2013-08-20 12:45:10 -07:00
l10n	[tx-robot] updated from transifex	2013-09-27 00:02:30 -04:00
lib	Resolve merge conflict	2013-09-27 13:34:15 +02:00
templates	LDAP: Show Host name in configuration drop down	2013-08-15 15:55:06 +02:00
tests	drop SimpleTest compatibility	2013-01-24 16:47:17 +01:00
group_ldap.php	Use !== and === in user_ldap app – Part 1	2013-04-20 22:46:37 +02:00
group_proxy.php	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
settings.php	LDAP: Show Host name in configuration drop down	2013-08-15 15:55:06 +02:00
user_ldap.php	LDAP: only connect to LDAP once on login	2013-08-17 12:16:51 +02:00
user_proxy.php	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00