mi primer fichero (tocame las pelotas según max)
Nuevo fichero Jesus.txt
Commit fichero Oscar
Commit de jj
nueva modificacion local en la rama de max
Commit fichero Oscar 2
Fichero modificado
Modificado Jesus.txt
Merge branch 'laramademax' into develop
Merge branch 'featureOscar' into develop
Merge branch 'featJesus' into develop
Merge branch 'develop' of https://github.com/jperealc-isban/tallerGitFlow into develop
Merge branch 'develop' of https://github.com/jperealc-isban/tallerGitFlow into develop
Merge branch 'develop' of https://github.com/jperealc-isban/tallerGitFlow into develop
Otro commit
Merge branch 'develop' of https://github.com/jperealc-isban/tallerGitFlow into develop
dsdsd
Merge branch 'develop' of https://github.com/jperealc-isban/tallerGitFlow into develop
Corregir el bug de Cristina
Merge branch 'release-1'