Build #948

Plan branch:

Build: #948 was successful Changes by CHItA

Code commits

phpBB Master

  • CHItA

    CHItA 4e1896af386609c6cbf7e4fa18b287f5f3277787

    Merge branch '3.3.x'

  • Máté Bartus <CHItA@users.noreply.github.com>

    Máté Bartus <CHItA@users.noreply.github.com> 8a746b457d7ba2451ba9dd4986c3217d5c59d092 m

    Merge pull request #6216 from marc1706/ticket/16570
    [ticket/16570] Support continuing update on manually merging files

  • Marc

    Marc 0502b9cc22ef1ccb07f32fad1369ece65f499106 m

    [ticket/16570] Support continuing update on manually merging files
    PHPBB3-16570

    • phpBB/phpbb/install/module/update_filesystem/task/diff_files.php (version 0502b9cc22ef1ccb07f32fad1369ece65f499106)
    • phpBB/phpbb/install/module/update_filesystem/task/download_updated_files.php (version 0502b9cc22ef1ccb07f32fad1369ece65f499106)
    • phpBB/phpbb/install/module/update_filesystem/task/update_files.php (version 0502b9cc22ef1ccb07f32fad1369ece65f499106)