phpbb/phpBB/phpbb/captcha/plugins
Joas Schilling 3af61075a8 Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/captcha/plugins/qa.php
2015-04-06 11:09:20 +02:00
..
captcha_abstract.php [ticket/13718] Added missing global declaration 2015-03-23 01:51:04 +01:00
gd.php [ticket/13455] Update calls to request_var() 2015-02-03 20:50:40 +01:00
gd_wave.php [ticket/11854] Use a set_name method instead of overriding get_service_name 2014-08-11 01:16:58 +02:00
nogd.php [ticket/11854] Don't override get service name in nogd 2014-08-11 08:04:14 +02:00
qa.php Merge branch '3.1.x' 2015-04-06 11:09:20 +02:00
recaptcha.php [ticket/13455] Update calls to request_var() 2015-02-03 20:50:40 +01:00