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

..

container

Merge branch '3.1.x'

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

routing

[ticket/13844] FAQ in new controller format

2015-05-16 22:09:05 +02:00

config.yml

[ticket/12620] Adds a yaml config file

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