Explorar o código

am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master

* commit '3656cc20c8a569964d0450ce3207b651c007c35c':
Jeff Davidson %!s(int64=11) %!d(string=hai) anos
pai
achega
87e6efa134

Os datos das diferenzas Diff non están dispoñibles.