projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d5a070 bd04de2)
merged branch igorw/composer (PR #452)
authorFabien Potencier <fabien.potencier@gmail.com>
Thu, 29 Sep 2011 14:47:57 +0000 (16:47 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Thu, 29 Sep 2011 14:47:57 +0000 (16:47 +0200)
Commits
-------

bd04de2 [composer] add composer.json

Discussion
----------

[composer] add composer.json


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