Marc Alexander 47b32f1da9 Merge branch '3.1.x' ...

Conflicts:
	phpBB/phpbb/avatar/driver/upload.php
	tests/avatar/manager_test.php

2015-08-08 22:23:03 +02:00

..

parameters.yml

…

services_auth.yml

…

services_avatar.yml

Merge branch '3.1.x'

2015-08-08 22:23:03 +02:00

services_captcha.yml

…

services_console.yml

Merge remote-tracking branch 'Nicofuma/ticket/12692'

2015-08-07 10:07:45 +02:00

services_content.yml

…

services_cron.yml

…

services_db.yml

…

services_event.yml

…

services_feed.yml

…

services_files.yml

[ticket/13740] Core file workarounds

2015-07-08 01:27:55 +02:00

services_help.yml

…

services_http.yml

[ticket/13740] Fix CS and extend phpbb extensions

2015-07-08 01:28:04 +02:00

services_language.yml

…

services_migrator.yml

…

services_mimetype_guesser.yml

…

services_module.yml

…

services_notification.yml

[ticket/11444] Update tests

2015-07-13 22:43:58 +02:00

services_password.yml

…

services_php.yml

[ticket/13740] Core file workarounds

2015-07-08 01:27:55 +02:00

services_profilefield.yml

…

services_report.yml

…

services_routing.yml

…

services_text_formatter.yml

[ticket/13935] Allow more admin-configurable schemes in post links

2015-07-15 22:05:06 +02:00

services_text_reparser.yml

…

services_twig.yml

…

services_user.yml

…

services.yml

[ticket/13740] Core file workarounds

2015-07-08 01:27:55 +02:00

tables.yml

[ticket/13740] Core file workarounds

2015-07-08 01:27:55 +02:00