mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	phpBB/phpbb/avatar/driver/upload.php
	tests/avatar/manager_test.php
This commit is contained in:
Marc Alexander
2015-08-08 22:23:03 +02:00
parent 46ffafd0c6 b7e4d0b0a5
commit 47b32f1da9
3 changed files with 72 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/config/default/container/services_avatar.yml
View File

@@ -64,6 +64,7 @@ services:
- @filesystem
- @path_helper
- @mimetype.guesser
- @dispatcher
- @cache.driver
calls:
- [set_name, [avatar.driver.upload]]