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

Conflicts:
	tests/template/template_includecss_test.php

2015-07-08 22:54:26 +02:00

..

node

Merge branch '3.1.x'

2015-07-08 22:54:26 +02:00

tokenparser

Merge pull request #3560 from Nicofuma/ticket/13790

2015-05-30 10:53:47 +02:00

definition.php

[ticket/12557] Template fixes

2014-08-03 07:12:34 +03:00

environment.php

Merge pull request #3591 from Nicofuma/ticket/12632

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

extension.php

[ticket/13762] Replace user service with lang in twig extension

2015-05-02 13:37:13 +02:00

lexer.php

[ticket/10388] Use TWIG escape JS filter instead of addslashes

2015-01-29 01:41:28 -08:00

loader.php

Merge branch '3.1.x'

2015-05-16 13:40:07 +02:00

twig.php

[ticket/13804] Remove unnecessary array_merge

2015-05-11 16:59:26 +02:00