|
nicofuma
|
567034e3061342731c3b2e019a10b3c1684364b4
567034e3061342731c3b2e019a10b3c1684364b4 |
Merge branch '3.2.x'
* 3.2.x:
[ticket/15011] Fix 3.2.x merge
[ticket/15011] Error not checked on metadata load failure |
|
|
nicofuma
|
d6e42ec63b54c54b488d3e4112f4cd83062731ba
m d6e42ec63b54c54b488d3e4112f4cd83062731ba |
[ticket/15011] Fix 3.2.x merge
PHPBB3-15011 |
|
|
nicofuma
|
935da1ed2b86ffe733dfdda8e8f49f4b7d717afc
m 935da1ed2b86ffe733dfdda8e8f49f4b7d717afc |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/15011] Error not checked on metadata load failure |
|
|
nicofuma
|
c3b7332ea854df03c2773b34df563d3e26ad8002
m c3b7332ea854df03c2773b34df563d3e26ad8002 |
Merge pull request #4646 from javiexin/ticket/15011
[ticket/15011] Error not checked on metadata load failure
* javiexin/ticket/15011:
[ticket/15011] Error not checked on metadata load failure |
|
|
javiexin <javiexin@gmail.com>
|
b9189ec325c20b6b058a2f4928152a253f04ae6c
m b9189ec325c20b6b058a2f4928152a253f04ae6c |
[ticket/15011] Error not checked on metadata load failure
PHPBB3-15011 |
|