|
Marc
|
e9ccc41336513a476383ca174c6deb83c3fdc4c8
e9ccc41336513a476383ca174c6deb83c3fdc4c8 |
Merge branch '3.2.x' |
|
|
Marc
|
ddfc52a5f6d0835067a33ff187ce8313e6088f4e
m ddfc52a5f6d0835067a33ff187ce8313e6088f4e |
Merge pull request #4571 from marc1706/ticket/14894
[ticket/14894] Use correct config name for conflicts archive extension |
|
|
Marc
|
37a3bd131bf82becc436c72a4e01975f4381d4f6
m 37a3bd131bf82becc436c72a4e01975f4381d4f6 |
[ticket/14894] Use correct config name for conflicts archive extension
PHPBB3-14894 |
|