Nicolas Toniazzi ad9c3d3b30 Merge branch 'master' of https://github.com/composer/composer ... Conflicts: src/Composer/Factory.php		2014-12-15 14:36:43 +01:00
..
articles	Wording tweaks and docblock formatting, refs #2536	2014-12-08 21:30:39 +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	scrapping next line	2014-12-13 19:05:52 +01:00
01-basic-usage.md	rewriting some documentation sections	2014-12-13 18:59:14 +01:00
02-libraries.md	Updated example to have a valid tag name.	2014-10-06 15:41:47 +01:00
03-cli.md	Merge branch 'master' of https://github.com/composer/composer	2014-12-15 14:36:43 +01:00
04-schema.md	Merge branch 'master' of https://github.com/composer/composer	2014-12-15 14:36:43 +01:00
05-repositories.md	fixed typo	2014-09-24 15:30:48 +02:00
06-community.md	Add user ml link	2012-10-24 10:22:40 +02:00