Nils Adermann a0faa4f69f Add a test for the complex conflict resolution fixed in #118 14 gadi atpakaļ
..
Composer a0faa4f69f Add a test for the complex conflict resolution fixed in #118 14 gadi atpakaļ
bootstrap.php 8e6f8ae57e Add prettyVersion to packages, fixes #76 14 gadi atpakaļ