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

…

colour_manager.php

…

factory.php

[ticket/11854] Fix comments

2014-08-11 01:16:50 +02:00

gd_wave.php

…

gd.php

[ticket/11854] Fix coding style

2014-08-11 01:16:30 +02:00

non_gd.php

…