phpBB Master

• 

  Marc 06 Dec 2016 bc6ce4c4afa03f7853bb6d979b205522688828f4

  Merge branch '3.2.x'
• 

  Marc 06 Dec 2016 129bfd5e62ed56edc9641795ca5d28059d181d88 m

  Merge branch 'ticket/14892' into 3.2.x
• 

  Marc 06 Dec 2016 e5504b74f0b44621003fe7826155069adc31b900 m

  [ticket/14892] Revert to twig 1.24 to have working assets again
  Twig 1.25 and after introduced a way of handling both relative and
  absolute paths. However, it seems to handle absolute windows paths as
  relative paths. This breaks any assets or similar ways of including files
  into the main template files.
  
  PHPBB3-14892

  • phpBB/composer.json (version e5504b74f0b44621003fe7826155069adc31b900)
  • phpBB/composer.lock (version e5504b74f0b44621003fe7826155069adc31b900)