msiebeneicher 7522a33079 Merge branch 'master' of https://github.com/composer/composer into add_exclude ... # By Jordi Boggiano (30) and others # Via Jordi Boggiano (37) and Morgan Campbell (1) * 'master' of https://github.com/composer/composer: (83 commits) Update 01-basic-usage.md Revert 331425bcb3 as well, fixes #3612 Revert "Disable overwrites when no-ansi is present, fixes #3612" Update deps Use justinrainbow/json-schema 1.4 Improved wording Fix docs basic-auth => http-basic Add test for Generics class Single variable for traits and enums Use HHVM_VERSION instead of HPHP_VERSION Add support for using classmap to autoload Hack enums Re-use existing autoloader suffix if available, fixes #3701 Report Travis CI build success early Test on HHVM nightly releases. Allow to fail. Make parseJson safer Use get home from Config instead of factory Fix env override regression, fixes #3820 [create-project] Used no progress value for dependencies Add docBlock and fix CS Fix output of first line of progress when output is not decorated, refs #3818 ...		2015-03-25 16:27:23 +01:00
..
Test	Merge branch 'master' of https://github.com/composer/composer into add_exclude	2015-03-25 16:27:23 +01:00
TestCase.php	Add parallel build to travis script	2013-09-25 10:23:48 +02:00