From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sun, 8 Apr 2012 12:20:37 +0000 (+0200)
Subject: merged branch igorw/composer (PR #691)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=46ae99fa4c11f76248b12da647fe64399f860e82;p=web%2Fkonrad%2Ftwig.git

merged branch igorw/composer (PR #691)

Commits
-------

72d3c19 [composer] Add branch alias for dev-master, adjust some other things

Discussion
----------

[composer] Add branch alias for dev-master, adjust some other things

* branch alias allows installation of dev-master by requiring 1.7.*, which is important since most packages depend on twig "<2.0.0"
* remove the version field, the version is determined by branch names and tags only
* change license to BSD-3, this is more explicit and the preferred format for BSD licenses
---

46ae99fa4c11f76248b12da647fe64399f860e82