projects / konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bee07e5 9e0907e)
bug #1370 Fixed inheritance in a 'use'-hierarchy (hason)
authorFabien Potencier <fabien.potencier@gmail.com>
Mon, 26 May 2014 00:00:46 +0000 (02:00 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Mon, 26 May 2014 00:00:46 +0000 (02:00 +0200)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Fixed inheritance in a 'use'-hierarchy

Fixes #1365

Commits
-------

9e0907e Fixed inheritance in a 'use'-hierarchy

1  2 
lib/Twig/Template.php patch | diff1 | diff2 | blob | history

diff --cc lib/Twig/Template.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.