phpBB Master

• 

  Marc 09 Dec 2016 e9ccc41336513a476383ca174c6deb83c3fdc4c8

  Merge branch '3.2.x'
• 

  Marc 09 Dec 2016 ddfc52a5f6d0835067a33ff187ce8313e6088f4e m

  Merge pull request #4571 from marc1706/ticket/14894
  [ticket/14894] Use correct config name for conflicts archive extension
• 

  Marc 09 Dec 2016 37a3bd131bf82becc436c72a4e01975f4381d4f6 m

  [ticket/14894] Use correct config name for conflicts archive extension
  PHPBB3-14894

  • phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php (version 37a3bd131bf82becc436c72a4e01975f4381d4f6)