projects / web/konrad/twig.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 43b8338) | patch
Revert "merged branch Cottser/master (PR #1071)"
authorFabien Potencier <fabien.potencier@gmail.com>
Thu, 31 Oct 2013 12:17:35 +0000 (13:17 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Thu, 31 Oct 2013 12:17:35 +0000 (13:17 +0100)
commitbc32ed81d54dce5e66f85787977f9ed28ec982da
tree0bcb048f4d9532b682596dc0656d60c195fc9b47tree | snapshot
parent43b8338e04500ca93654c57fded80003c811ec56commit | diff
Revert "merged branch Cottser/master (PR #1071)"

This reverts commit 2f5c9899a4088fce3bb6325d96232cd1978161e4, reversing
changes made to 4e7094f6a3831dc86b4963d805c4567f4076fce3.

Conflicts:
lib/Twig/Environment.php
lib/Twig/Environment.php diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.