Rubén Calvo ef00bb4da5 [ticket/15276] Resolve conflicts ...

PHPBB3-15276

2017-08-25 15:31:58 +02:00

..

parameters.yml

[ticket/12620] Adds a yaml config file

2014-11-20 20:59:48 +01:00

services_attachment.yml

[ticket/14523] Replace prototype definition with shared services

2016-03-10 10:41:00 +01:00

services_auth.yml

Merge branch '3.1.x' into 3.2.x

2016-11-13 21:29:14 +01:00

services_avatar.yml

[ticket/15276] Use storage in avatars

2017-08-25 15:31:58 +02:00

services_captcha.yml

[ticket/14523] Replace prototype definition with shared services

2016-03-10 10:41:00 +01:00

services_console.yml

Merge branch '3.2.x'

2017-06-25 10:24:15 +02:00

services_content.yml

[ticket/15253] Use storage helper methods instead of filesystem methods

2017-07-20 19:55:52 +02:00

services_cron.yml

Merge branch '3.2.x'

2017-06-06 09:33:57 +02:00

services_db.yml

Merge branch 'ticket/14957' into ticket/14957-rhea

2017-01-03 21:41:36 +01:00

services_event.yml

[ticket/14247] Use quotes around @ and % strings in YAML

2015-12-07 13:11:22 -08:00

services_extensions.yml

[ticket/15253] Use storage helper methods instead of filesystem methods

2017-07-20 19:55:52 +02:00

services_feed.yml

Merge branch '3.1.x' into 3.2.x

2016-07-17 22:09:53 +02:00

services_files.yml

[ticket/15276] Resolve conflicts

2017-08-25 15:31:58 +02:00

services_filesystem.yml

[ticket/14039] Revamp updater

2015-10-17 23:05:57 +02:00

services_help.yml

[ticket/14247] Use quotes around @ and % strings in YAML

2015-12-07 13:11:22 -08:00

services_hook.yml

[ticket/14247] Use quotes around @ and % strings in YAML

2015-12-07 13:11:22 -08:00

services_http.yml

[ticket/14247] Use quotes around @ and % strings in YAML

2015-12-07 13:11:22 -08:00

services_language.yml

[ticket/14247] Use quotes around @ and % strings in YAML

2015-12-07 13:11:22 -08:00

services_migrator.yml

[ticket/14247] Use quotes around @ and % strings in YAML

2015-12-07 13:11:22 -08:00

services_mimetype_guesser.yml

[ticket/14247] Use quotes around @ and % strings in YAML

2015-12-07 13:11:22 -08:00

services_module.yml

[ticket/14247] Use quotes around @ and % strings in YAML

2015-12-07 13:11:22 -08:00

services_notification.yml

[ticket/14523] Replace prototype definition with shared services

2016-03-10 10:41:00 +01:00

services_password.yml

Merge branch 'ticket/15219' into ticket/15219-rhea

2017-05-05 21:08:13 -04:00

services_php.yml

[ticket/13904] Modify files for changes in ini wrapper

2015-09-09 08:29:05 +02:00

services_profilefield.yml

[ticket/14247] Use quotes around @ and % strings in YAML

2015-12-07 13:11:22 -08:00

services_report.yml

[ticket/14523] Replace prototype definition with shared services

2016-03-10 10:41:00 +01:00

services_routing.yml

[ticket/15253] Use storage helper methods instead of filesystem methods

2017-07-20 19:55:52 +02:00

services_storage.yml

[ticket/15276] Resolve conflicts

2017-08-25 15:31:58 +02:00

services_text_formatter.yml

[ticket/14555] Uniformize cache directory usages

2016-03-24 09:15:34 +01:00

services_text_reparser.yml

[ticket/14925] Set reparser names in service definitions

2016-12-18 01:28:51 -08:00

services_twig.yml

[ticket/15253] Use storage helper methods instead of filesystem methods

2017-07-20 19:55:52 +02:00

services_user.yml

[ticket/14247] Use quotes around @ and % strings in YAML

2015-12-07 13:11:22 -08:00

services.yml

[ticket/15287] Add services

2017-07-21 19:26:58 +02:00

tables.yml

[ticket/14250] Change token_storage class to fit changed interface

2016-01-04 03:38:28 +01:00