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

[ticket/11700] Fix authentication acp after develop merge

2013-09-16 03:22:13 +02:00

avatars.yml

[ticket/11930] Move path_helper in front of optional cache argument

2013-10-21 10:20:12 +02:00

console.yml

[ticket/11998] Turn develop/extensions.php into console commands.

2013-11-05 21:40:42 +01:00

cron_tasks.yml

[feature/plupload/cron] Namespacification

2013-10-11 15:53:22 +02:00

feed.yml

[ticket/11700] Move all recent code to namespaces

2013-09-16 00:25:27 +02:00

migrator.yml

[ticket/11700] Move all recent code to namespaces

2013-09-16 00:25:27 +02:00

mimetype_guessers.yml

[ticket/11912] Introduce guesser priority to mimetype guessers

2013-11-11 21:18:23 +01:00

notifications.yml

Merge pull request #1812 from prototech/ticket/11746

2013-11-02 11:55:16 -07:00

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

[feature/oauth] Fix more errors related to sql changes

2013-07-23 22:29:27 -04:00