Nils Adermann a0faa4f69f Add a test for the complex conflict resolution fixed in #118 %!s(int64=14) %!d(string=hai) anos
..
Composer a0faa4f69f Add a test for the complex conflict resolution fixed in #118 %!s(int64=14) %!d(string=hai) anos
bootstrap.php 8e6f8ae57e Add prettyVersion to packages, fixes #76 %!s(int64=14) %!d(string=hai) anos