Nils Adermann f958d05aed Merge branch '3.1.x' ...

* 3.1.x:
  [ticket/13790] Update phpcs

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock

2015-05-30 10:58:40 +02:00

..

exception

[ticket/13804] Make template's user dependency optional

2015-05-05 19:16:49 +02:00

twig

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

asset.php

[ticket/13638] Inject $filesystem in \phpbb\template\asset

2015-05-05 17:07:11 +02:00

base.php

[ticket/13070] Use old 'template' class for template class hook

2014-09-22 20:03:55 +02:00

context.php

…

template.php

…