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

…

container_builder.php

Merge branch '3.1.x'

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

service_collection_iterator.php

…

service_collection.php

…