phpbb/phpBB/phpbb/captcha
Joas Schilling 3af61075a8 Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/captcha/plugins/qa.php
2015-04-06 11:09:20 +02:00
..
plugins Merge branch '3.1.x' 2015-04-06 11:09:20 +02:00
char_cube3d.php [ticket/11854] Split phpbb\captcha\gd.php 2014-08-11 01:16:15 +02:00
colour_manager.php [ticket/11854] Split phpbb\captcha\gd.php 2014-08-11 01:16:15 +02:00
factory.php [ticket/11854] Fix comments 2014-08-11 01:16:50 +02:00
gd.php [ticket/11854] Fix coding style 2014-08-11 01:16:30 +02:00
gd_wave.php [ticket/11854] Move captcha stuff to phpbb/ and use DI for plugins 2014-08-11 01:15:49 +02:00
non_gd.php [ticket/11854] Migrate all old php4 constructor 2014-08-11 01:16:10 +02:00