Nicolas Toniazzi b6df8549cd Merge remote-tracking branch 'parent/master' ... Conflicts: src/Composer/Factory.php		2015-10-05 09:52:52 +02:00
..
articles	Typo: prefering -> preferring	2015-10-03 22:40:55 +02:00
dev	Prioritize repository over package versions in the default policy, fixes #3509	2015-04-30 10:43:04 +01:00
faqs	Ignore all .git dirs in the vendor dir recursively	2015-04-14 09:46:53 +02: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	reworking basic usage, added versions article	2015-06-30 15:49:00 +02:00
01-basic-usage.md	Advise the use of absolute paths, fixes #4259	2015-07-21 14:46:38 +01:00
02-libraries.md	added some links and some restructuring	2015-06-30 15:49:00 +02:00
03-cli.md	Merge remote-tracking branch 'parent/master'	2015-10-05 09:52:52 +02:00
04-schema.md	the note already explains the same, but better	2015-06-22 11:23:09 +02:00
05-repositories.md	Use 'note' box to inform about wildcards	2015-09-18 14:23:54 +02:00
06-config.md	Merge remote-tracking branch 'parent/master'	2015-10-05 09:52:52 +02:00
07-community.md	more consistent ucfirst composer references	2015-06-22 11:08:23 +02:00