Commits · 7d72c6ec7b2b57cacf05204f979f9bb46351f5ac · Antonio Calero / formacion

11 Jun, 2018 30 commits
- Merge branch 'rama-nueva' into 'master' · 7d72c6ec
  Antonio Calero authored Jun 11, 2018
```
Creamos nuevo fichero

See merge request !2
```
  7d72c6ec
- Creamos nuevo fichero · 288ab554
  Antonio Calero authored Jun 11, 2018
  
  288ab554
- qerfaMerge branch 'NouLluis' · d061507a
  Gabri Aparício authored Jun 11, 2018
  
  d061507a
- querqer · f7a337a6
  Gabri Aparício authored Jun 11, 2018
  
  f7a337a6
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 5b9b0cdc
  Palmira Febrer authored Jun 11, 2018
  
  5b9b0cdc
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 5d2cb34e
  Gabri Aparício authored Jun 11, 2018
  
  5d2cb34e
- Prueba creando rama-febrer · 6bff2085
  Palmira Febrer authored Jun 11, 2018
  
  6bff2085
- Prova nova · d49173e8
  Gabri Aparício authored Jun 11, 2018
```
Merge branch 'master' into Lluis
```
  d49173e8
- Fusionando la rama · f5753452
  Antonio Calero authored Jun 11, 2018
```
Merge branch 'acalero-update'
```
  f5753452
- Modifico mi fichero en la rama acalero-update · c814b446
  Antonio Calero authored Jun 11, 2018
  
  c814b446
- Ai senyor... · 98607cf1
  Gabri Aparício authored Jun 11, 2018
  
  98607cf1
- Que sí · a7179991
  Gabri Aparício authored Jun 11, 2018
  
  a7179991
- Merge https://gitlab.uv.es/camonan/formacion · 88b17409
  Paola Sabogal authored Jun 11, 2018
  
  88b17409
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · e03e1992
  FRANCISCO JURADO SANCHEZ authored Jun 11, 2018
  
  e03e1992
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 94602834
  Antonio Calero authored Jun 11, 2018
  
  94602834
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 36d3b8d7
  MAngeles Ferragud authored Jun 11, 2018
  
  36d3b8d7
- Merge https://gitlab.uv.es/camonan/formacion · 318ca8e8
  Paola Sabogal authored Jun 11, 2018
  
  318ca8e8
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 08b45792
  Palmira Febrer authored Jun 11, 2018
  
  08b45792
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 53629cee
  Antonio Calero authored Jun 11, 2018
  
  53629cee
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · c9ee35f2
  MAngeles Ferragud authored Jun 11, 2018
  
  c9ee35f2
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 8b6548da
  FRANCISCO JURADO SANCHEZ authored Jun 11, 2018
  
  8b6548da
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 647b21f0
  Palmira Febrer authored Jun 11, 2018
  
  647b21f0
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 30a2219a
  Gabri Aparício authored Jun 11, 2018
  
  30a2219a
- <Cambio hecho por Paola> · bad7c0bc
  Paola Sabogal authored Jun 11, 2018
  
  bad7c0bc
- Primer commit · a1d92e87
  FRANCISCO JURADO SANCHEZ authored Jun 11, 2018
  
  a1d92e87
- MAngeles subo fichero · 36dc79ff
  MAngeles Ferragud authored Jun 11, 2018
  
  36dc79ff
- comitea balfa · d8869bf5
  Antonio Calero authored Jun 11, 2018
  
  d8869bf5
- Fichero de Palmira · a95c18cf
  Palmira Febrer authored Jun 11, 2018
  
  a95c18cf
- subocambiode fichero · 22312ec1
  mi edo authored Jun 11, 2018
  
  22312ec1
- Molt bé · c8d23cb3
  Gabri Aparício authored Jun 11, 2018
  
  c8d23cb3
06 Jun, 2018 1 commit
- v3 mensaje tres · 11cd5fde
  Pedro Garcia authored Jun 06, 2018
  
  11cd5fde
05 Jun, 2018 9 commits
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 67335cc0
  root authored Jun 05, 2018
```
Divergencias sugiere pull
```
  67335cc0
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 84c25f70
  Antonio Calero authored Jun 05, 2018
  
  84c25f70
- Cambios · 06f57816
  Antonio Calero authored Jun 05, 2018
  
  06f57816
- archivo en python · a4121b19
  root authored Jun 05, 2018
  
  a4121b19
- v3 Cobol pruebas · 11b35446
  Pedro Garcia authored Jun 05, 2018
  
  11b35446
- flino v3 · 45f0b4dd
  Pedro Garcia authored Jun 05, 2018
  
  45f0b4dd
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 31c0a170
  Victor Garcia Pau authored Jun 05, 2018
  
  31c0a170
- first commit of garpau4 !!!! · 88f8b17a
  Victor Garcia Pau authored Jun 05, 2018
  
  88f8b17a
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · b3b241e6
  Moblayma authored Jun 05, 2018
  
  b3b241e6