diff options
author | Andreas Fischer <bantu@phpbb.com> | 2013-05-19 16:20:40 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-19 16:20:40 +0200 |
commit | a0f76f73e9a5865d8144b3b3c2316a485794db24 (patch) | |
tree | 7eaab9c8c4a4cab92bdde11040d6ebcde3bc9c2e /phpBB/includes/functions_transfer.php | |
parent | f49be858598f10abfb9c7886bd698cdec862fe1c (diff) | |
parent | 6890bf9f8d97473d55f2d6819c8ec155f9d52658 (diff) | |
download | forums-a0f76f73e9a5865d8144b3b3c2316a485794db24.tar forums-a0f76f73e9a5865d8144b3b3c2316a485794db24.tar.gz forums-a0f76f73e9a5865d8144b3b3c2316a485794db24.tar.bz2 forums-a0f76f73e9a5865d8144b3b3c2316a485794db24.tar.xz forums-a0f76f73e9a5865d8144b3b3c2316a485794db24.zip |
Merge remote-tracking branch 'marc1706/ticket/11535' into develop
* marc1706/ticket/11535:
[ticket/11535] Correctly merge avatar_errors array into primary error array
Diffstat (limited to 'phpBB/includes/functions_transfer.php')
0 files changed, 0 insertions, 0 deletions