projects / konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0bf57a8 4383388)
merged branch tucksaun/fix-5.2-TSRM (PR #1037)
authorFabien Potencier <fabien.potencier@gmail.com>
Fri, 22 Mar 2013 15:32:12 +0000 (16:32 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Fri, 22 Mar 2013 15:32:12 +0000 (16:32 +0100)
This PR was merged into the master branch.

Discussion
----------

Revert "merged branch pierrejoye/master (PR #855)"

This reverts commit 347bc81d6ed8e2bb793236aa9917c7e83f81c2b3

This commit make compilation failed for PHP5.2 with thread-safe enabled (see https://travis-ci.org/fabpot/Twig/jobs/5523865)

Commits
-------

4383388 Revert "merged branch pierrejoye/master (PR #855)"


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.