Build #106

Plan branch:

Build: #106 failed Changes by nicofuma

Code commits

phpBB Rhea

  • nicofuma

    nicofuma 50f5efba9cee542d6660b403c52c8a82dc9bbedf

    Merge branch '3.1.x' into 3.2.x
    * 3.1.x:
      [ticket/14795] Use maximum topic views instead of adding up views in merge

  • nicofuma

    nicofuma 9be9062df358aa6744b5764ac841a6b685d3ad6a m

    Merge pull request #4485 from marc1706/ticket/14795
    [ticket/14795] Use maximum topic views instead of adding up views in merge

    * github.com:phpbb/phpbb:
      [ticket/14795] Use maximum topic views instead of adding up views in merge

  • Marc

    Marc fce30d1d91d7e1e4a2c2989640d5c5176e7fada0 m

    [ticket/14795] Use maximum topic views instead of adding up views in merge
    Merging topics should not result in topic views being added up but rather in
    the highest topic view showing up for the merged topic.

    PHPBB3-14795

    • phpBB/includes/mcp/mcp_forum.php (version fce30d1d91d7e1e4a2c2989640d5c5176e7fada0)