Andreas Fischer 9296c75738 Merge branch '3.1.x' ...

* 3.1.x:
  [ticket/13903] Replacing regexp path naming for container by md5.

Conflicts:
	phpBB/phpbb/di/container_builder.php

2015-06-16 20:06:28 +02:00

..

extension

[ticket/13849] Fix development environment

2015-05-19 21:59:41 +02:00

pass

[ticket/13106] Remove \phpbb\di\pass\kernel_pass.php

2014-09-25 20:12:33 +02:00

container_builder.php

Merge branch '3.1.x'

2015-06-16 20:06:28 +02:00

service_collection_iterator.php

[ticket/12575] Do not duplicate logic in service_collection_iterator.

2014-06-14 18:33:23 +02:00

service_collection.php

[ticket/12575] Just forward service_collection::offsetGet() to container.

2014-06-14 19:01:53 +02:00