1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-30 03:30:17 +02:00

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

Conflicts:
	tests/functional/fixtures/ext/foo/bar/config/services.yml
This commit is contained in:
Marc Alexander
2013-12-07 13:32:19 +01:00
183 changed files with 3570 additions and 1986 deletions

View File

@@ -6,3 +6,12 @@ services:
- @template
- %core.root_path%
- %core.php_ext%
foo_bar.listener.permission:
class: foo\bar\event\permission
tags:
- { name: event.listener }
foo_bar.listener.user_setup:
class: foo\bar\event\user_setup
tags:
- { name: event.listener }