phpBB Master

• 

  Marc 04 Jan 2017 ac1bf79904750b10de5c18199260183a412a4517

  Merge branch '3.2.x'
• 

  Marc 04 Jan 2017 655d40679df5b3f7c7ceaa4328b3313d1acd34d6 m

  Merge pull request #4614 from marc1706/ticket/14838
  [ticket/14838] Add missing method to mock'ed feed
• 

  Marc 04 Jan 2017 b582a19039acb004d38927cde29f459f8bf4039f m

  [ticket/14838] Correctly instantiate language object
  PHPBB3-14838

  • tests/feed/attachments_base_test.php (version b582a19039acb004d38927cde29f459f8bf4039f)
• 

  Marc 04 Jan 2017 1db7aa712af0521f1a64e90c6fcf4972ac5b08c2 m

  [ticket/14838] Add missing method to mock'ed feed
  PHPBB3-14838

  • tests/feed/attachments_mock_feed.php (version 1db7aa712af0521f1a64e90c6fcf4972ac5b08c2)