Jordi Boggiano 7b4fcd93d3 Merge remote-tracking branch 'webfactory/issue-2698' ... Conflicts: src/Composer/Repository/ArtifactRepository.php		2014-07-19 21:35:51 +02:00
..
Composer	Merge remote-tracking branch 'webfactory/issue-2698'	2014-07-19 21:35:51 +02:00
bootstrap.php	Make sure a good timezone is set, fixes #2899	2014-04-14 13:55:17 +02:00
complete.phpunit.xml	Rename tests/phpunit.xml.dist for clarity	2012-06-25 18:59:41 +02:00