projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7657c01 2c9e26e)
merged branch Seldaek/date_modify (PR #760)
authorFabien Potencier <fabien.potencier@gmail.com>
Wed, 27 Jun 2012 09:12:10 +0000 (11:12 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Wed, 27 Jun 2012 09:12:10 +0000 (11:12 +0200)
Commits
-------

2c9e26e Fix date_modify filter for PHP 5.2

Discussion
----------

Fix date_modify filter for PHP 5.2

The return of the object was added in 5.3, this hopefully fixes it.


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