Marc Alexander 943ab555da Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912 ...

Conflicts:
	phpBB/config/services.yml

2013-11-23 00:54:56 +01:00

..

.htaccess

…

auth_providers.yml

…

avatars.yml

…

console.yml

…

cron_tasks.yml

…

feed.yml

…

migrator.yml

…

mimetype_guessers.yml

…

notifications.yml

…

routing.yml

…

services.yml

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912

2013-11-23 00:54:56 +01:00

tables.yml

…