phpBB Master

• 

  Marc 28 Nov 2019 f547024751876ccf0250e877ea316b272d1823e5

  Merge branch '3.3.x'
• 

  Marc 28 Nov 2019 ac6676a1445bacf0df51c9ebaf91fa69f4535ba0 m

  Merge branch '3.2.x' into 3.3.x
• 

  Marc 28 Nov 2019 03e15166c72be6862fb1d3ca3a178196df80f971 m

  Merge pull request #5747 from JoshyPHP/ticket/16228
  [ticket/16228] Fix BBCodes merging
• 

  JoshyPHP <s9e.dev@gmail.com> 25 Nov 2019 d6f5b5ef6cd052d43f4bf75af423eaafd8ba9b07 m

  [ticket/16228] Fix BBCodes merging
  PHPBB3-16228

  • phpBB/phpbb/textformatter/s9e/bbcode_merger.php (version d6f5b5ef6cd052d43f4bf75af423eaafd8ba9b07)
  • tests/text_formatter/s9e/bbcode_merger_test.php (version d6f5b5ef6cd052d43f4bf75af423eaafd8ba9b07)