projects / konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27f3e0f 9b95570)
bug #1311 fixed the conversion of the special '0000-00-00 00:00' date (fabpot)
authorFabien Potencier <fabien.potencier@gmail.com>
Sun, 5 Jan 2014 00:05:42 +0000 (01:05 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Sun, 5 Jan 2014 00:05:42 +0000 (01:05 +0100)
This PR was merged into the 1.15-dev branch.

Discussion
----------

fixed the conversion of the special '0000-00-00 00:00' date

This PR reverts #1234 and add supports for PHP 5.5 is a simpler way. This also fixes #1241 and closes #1242.

Commits
-------

9b95570 fixed the conversion of the special '0000-00-00 00:00' date


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