May 17, 2019
View 0f5a0569

bumped version to 1.42

Fabien Potencier authored on 17/05/2019 06:22:23
View c8d2cc3a

Merge branch '1.x' into 2.x

Fabien Potencier authored on 17/05/2019 06:14:40
View b086d4f4

fixed typo

Fabien Potencier authored on 17/05/2019 06:14:31
View e9a09d90

Merge branch '1.x' into 2.x

Fabien Potencier authored on 17/05/2019 06:09:05
View 11353ce3

fixed a PHP fatal error when calling a macro imported in the template in a nested block

Fabien Potencier authored on 17/05/2019 05:17:34
May 16, 2019
View 73326f0d

Merge branch '1.x' into 2.x

Fabien Potencier authored on 16/05/2019 18:18:06
View bd1f9eb3

bug #3011 Fix a regression (fabpot)

Fabien Potencier authored on 16/05/2019 18:17:10
View 3c7602b9

fixed a regression

Fabien Potencier authored on 16/05/2019 17:24:46
View e671f267

Merge branch '1.x' into 2.x

Fabien Potencier authored on 16/05/2019 14:31:36
View 06670f36

made code more readable

Fabien Potencier authored on 16/05/2019 14:30:26
View ad1d08a4

Merge branch '1.x' into 2.x

Fabien Potencier authored on 16/05/2019 14:16:50
View 70c1b3a2

tweaked the error message when using extends in a block/macro

Fabien Potencier authored on 16/05/2019 14:06:57
View b0f29468

simplified code

Fabien Potencier authored on 16/05/2019 12:16:39
View 10d1145e

Merge branch '1.x' into 2.x

Fabien Potencier authored on 16/05/2019 12:16:01
View ba9b9681

fixed a PHP fatal error when calling a macro, imported in the template, in another macro

Fabien Potencier authored on 16/05/2019 11:58:43