Marc Alexander 5d091e2d8f Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars ...

Conflicts:
	phpBB/includes/ucp/ucp_groups.php

2013-01-04 10:49:57 +01:00

..

.htaccess

[feature/dic] Add trailing newline to htaccess

2012-07-26 15:58:26 +02:00

avatars.yml

[feature/avatars] Call set_name() method in avatars.yml

2012-12-09 19:42:50 +01:00

cron_tasks.yml

[ticket/11257] Do not require set_name() method to exist

2012-12-07 21:25:42 -06:00

routing.yml

[feature/controller] Update routing documentation for using query string

2012-11-18 13:40:24 -05:00

services.yml

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars

2013-01-04 10:49:57 +01:00

tables.yml

[feature/dic] Configure container via config.php, use compiler pass

2012-07-21 16:14:40 +02:00