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
..
articles	Merge remote-tracking branch 'tractorcow/pulls/fix-numeric-alias'	2015-01-20 10:18:29 +00:00
dev	Typo fixes	2012-06-20 14:15:54 -07:00
faqs	Merge pull request #3246 from richardkmiller/patch-1	2014-10-17 16:09:33 +01:00
fixtures	Update fixtures to include gar/nix (which is being replaced) and bar/baz (which has a branch-alias)	2014-10-13 12:55:00 +02:00
00-intro.md	Merge branch 'master' into tls-config	2015-01-29 20:31:56 +00:00
01-basic-usage.md	I think 'dump-autoload' command is more proper.	2015-01-28 15:07:44 +09:00
02-libraries.md	Update documententation for version shorthand parsing	2015-01-20 09:05:40 +01:00
03-cli.md	Merge branch 'master' into tls-config	2015-01-29 20:31:56 +00:00
04-schema.md	Merge pull request #3610 from bd808/feature/classmap-authoritative	2015-01-28 11:26:28 +01:00
05-repositories.md	Fixed json syntax error	2015-01-16 20:59:30 +01:00
06-community.md	Add user ml link	2012-10-24 10:22:40 +02:00