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_interface.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

driver.php

[ticket/8672] Use fastImageSize in classes

2015-04-24 13:33:14 +02:00

gravatar.php

[ticket/8672] Use fastImageSize in classes

2015-04-24 13:33:14 +02:00

local.php

[ticket/8672] Use fastImageSize in classes

2015-04-24 13:33:14 +02:00

remote.php

[ticket/8672] Use fastImageSize in classes

2015-04-24 13:33:14 +02:00

upload.php

Merge branch '3.1.x'

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