Marc Alexander f09db1a7b4 Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/config/services.yml

2014-08-11 12:23:21 +02:00

..

.htaccess

…

auth_providers.yml

[ticket/11854] Fix the factory in \phpbb\auth\provider\db

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

avatars.yml

…

captcha.yml

[ticket/11854] Use a set_name method instead of overriding get_service_name

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

console.yml

…

cron_tasks.yml

…

feed.yml

…

migrator.yml

…

mimetype_guessers.yml

…

notifications.yml

…

parameters.yml

[ticket/12932] Add method for getting the datetime class and allow overriding

2014-08-10 13:41:08 +02:00

passwords.yml

…

profilefields.yml

…

routing.yml

…

services.yml

Merge branch 'develop-ascraeus' into develop

2014-08-11 12:23:21 +02:00

tables.yml

…

twig.yml

[ticket/11649] Expose Twig through the container

2014-08-09 16:13:22 +02:00