Jander
Autores del puti
Merge remote-tracking branch 'Manuel/dorito' into dorito
Merge remote-tracking branch 'antonio/devel' into devel
Incluido mi proyecto en gitignore
Añadida clase condon
Master Master
Las tapas se acaban
Merge remote-tracking branch 'Manuel/devel' into devel
Merge remote-tracking branch 'Fernando/devel' into devel
Merge remote-tracking branch 'Fer/devel' into devel
Merge remote-tracking branch 'antonio/dorito' into devel
Merge remote-tracking branch 'antonio/devel' into devel
Merge remote-tracking branch 'Manuel/devel' into devel
Merge remote-tracking branch 'Manuel/devel' into devel
sube clase Borracho
Merge remote-tracking branch 'remote_Manuel/devel' into devel
commit
commit2
Merge pull request #1 from alinares31/ramera_al_integrador

Ramera al integrador