Marc Alexander 01097a24b5 Merge branch '3.1.x' ...

Conflicts:
	tests/template/template_includecss_test.php

2015-07-08 22:54:26 +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-07-08 22:54:26 +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

[ticket/12892] Do not set S_NUM_ROWS when adding a row to a template loop

2014-07-25 17:48:53 +02:00

template.php

…