README developer-branch
third commit
commit from cnpallares-branch
conflicts fixed
commitrafa
carlesfile was added
Merge branch 'cnpallares'
Merge branch 'master' of https://github.com/cnpallares/repositori-prova
Merge branch 'rpcolom'
Merge branch 'master' of https://github.com/cnpallares/repositori-prova
nova modificacio a readme desde cnpallares
conflict in README from master
Merge branch 'master' of https://github.com/cnpallares/repositori-prova
Merge branch 'rpcolom'
Merge branch 'master' of https://github.com/cnpallares/repositori-prova
Merge branch 'master' into rpcolom