projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 599a508 9a79078)
Merge remote branch 'nikic/fixWrongMethodCallInTest'
authorFabien Potencier <fabien.potencier@gmail.com>
Mon, 11 Apr 2011 16:51:49 +0000 (18:51 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Mon, 11 Apr 2011 16:51:49 +0000 (18:51 +0200)
* nikic/fixWrongMethodCallInTest:
  $e->setFilename to $e->setTemplateFile in integrationTest


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