public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code
composer/res
History
Padraic Brady 19e24c5804 Merge branch 'master' into tls-config 
Conflicts:
	.travis.yml
	doc/03-cli.md
	src/Composer/Command/ConfigCommand.php
	src/Composer/Command/CreateProjectCommand.php
	src/Composer/Command/DiagnoseCommand.php
	src/Composer/Command/InstallCommand.php
	src/Composer/Command/RequireCommand.php
	src/Composer/Command/SelfUpdateCommand.php
	src/Composer/Command/ShowCommand.php
	src/Composer/Command/UpdateCommand.php
	src/Composer/Config.php
	src/Composer/Downloader/FileDownloader.php
	src/Composer/Factory.php
	src/Composer/Repository/ComposerRepository.php
	src/Composer/Repository/PearRepository.php
	src/Composer/Repository/Vcs/VcsDriver.php
	src/Composer/Util/GitHub.php
	src/Composer/Util/RemoteFilesystem.php
 		2015-01-29 20:31:56 +00:00
..
cacert.pem Add a bundled cacert.pem as a last resort option 2014-03-02 14:06:47 +00:00
composer-schema.json Add classmap-authoritative config setting 2015-01-03 17:35:25 -07:00
spdx-identifier.json Update SPDX licenses, fixes #3431 2014-11-18 10:30:16 +00:00