Igor Wiedler 14636f61d5 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too

Conflicts:
	phpBB/includes/auth/auth_db.php

2011-10-14 03:56:55 +02:00

..

auth_apache.php

[feature/request-class] Adjust code base to do html decoding manually

2011-08-18 23:44:30 +02:00

auth_db.php

Merge branch 'develop-olympus' into develop

2011-10-14 03:56:55 +02:00

auth_ldap.php

Merge branch 'develop-olympus' into develop

2011-06-09 13:00:39 +02:00

index.htm

…