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

..

driver

[ticket/12620] Fix rebase

2014-11-20 23:15:49 +01:00

fixtures

[ticket/13197] Test that user's group avatar is deleted by group avatar delete

2014-10-26 12:42:47 -07:00

manager_test.php

Merge branch '3.1.x'

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