Marc Alexander a079c5fed0

Merge branch 'ticket/15178' into ticket/15179

2017-05-31 20:20:43 +02:00

..

extension

[ticket/13645] Move the feeds to controllers

2015-08-23 22:36:10 +02:00

node

[ticket/14446] Add predefined placeholder variables to twig definition

2016-02-02 17:13:47 +01:00

tokenparser

Merge pull request #3560 from Nicofuma/ticket/13790

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

definition.php

[ticket/14457] Uses a random placeholder to inject css and js

2016-02-18 17:30:31 +01:00

environment.php

[ticket/14990] Move dispatcher object to the front of the options array

2017-04-16 23:40:16 +07:00

extension.php

Merge branch '3.1.x' into 3.2.x

2017-01-06 15:29:40 +01:00

lexer.php

Merge branch 'ticket/15178' into ticket/15179

2017-05-31 20:20:43 +02:00

loader.php

Merge branch 'ticket/15178' into ticket/15179

2017-05-31 20:20:43 +02:00

twig.php

[ticket/14661] Fix a typo in twig.php

2016-06-05 13:40:40 +03:00