Commits · eb3e07d6c504130ebe9a2350dc6b5d808b33c080 · Antonio Calero / formacion

05 Jun, 2018 19 commits
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · eb3e07d6
  albiu authored Jun 05, 2018
  
  eb3e07d6
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 05d7ded0
  Jira - Gitlab integrator authored Jun 05, 2018
  
  05d7ded0
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · a0f8ed96
  Carmen Lorca authored Jun 05, 2018
```
Otra vez?
```
  a0f8ed96
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 6ff04edf
  Jira - Gitlab integrator authored Jun 05, 2018
  
  6ff04edf
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · d3f20909
  albiu authored Jun 05, 2018
  
  d3f20909
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · d9c74115
  Victor Garcia Pau authored Jun 05, 2018
  
  d9c74115
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 0bb7e9a1
  Carmen Lorca authored Jun 05, 2018
```
El cambio era necesario
```
  0bb7e9a1
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · e0d932da
  Victor Garcia Pau authored Jun 05, 2018
  
  e0d932da
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · c6597d65
  root authored Jun 05, 2018
```
Hola
```
  c6597d65
- subiendo primeros cambios · ce8b0ef3
  Carmen Lorca authored Jun 05, 2018
  
  ce8b0ef3
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · bfdd7932
  Pedro Garcia authored Jun 05, 2018
  
  bfdd7932
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion · 61e5cbfa
  albiu authored Jun 05, 2018
  
  61e5cbfa
- Merge branch 'master' of https://gt stlab.uv.es/camonan/formacion · c98895e5
  Victor Garcia Pau authored Jun 05, 2018
```
xplain why this merge is necessary,
```
  c98895e5
- primer commit · 49d921bc
  Jira - Gitlab integrator authored Jun 05, 2018
  
  49d921bc
- Hola · bc37f188
  root authored Jun 05, 2018
  
  bc37f188
- pedroGarcia.txt · 8d6a099b
  Pedro Garcia authored Jun 05, 2018
  
  8d6a099b
- first commit of garpau4 !!!! · 484068c4
  Victor Garcia Pau authored Jun 05, 2018
  
  484068c4
- Commit realizado · cf9e7ead
  JULIO ALBERTO FERNANDEZ OLIVER authored Jun 05, 2018
  
  cf9e7ead
- FMDTARJE.cbl · bb50a724
  albiu authored Jun 05, 2018
  
  bb50a724
04 Jun, 2018 8 commits
- Merge branch 'master' of https://gitlab.uv.es/camonan/formacion.git · 57b765f7
  excentia authored Jun 04, 2018
```
Conflicts:
	README.md
```
  57b765f7
- Trabajando en master · afe3f475
  Antonio Calero authored Jun 04, 2018
  
  afe3f475
- Trabajando en feature-2 · 36c07ffd
  excentia authored Jun 04, 2018
  
  36c07ffd
- Merge branch 'feature1' into 'master' · 5f02371e
  Antonio Calero authored Jun 04, 2018
```
Feature en rama (petición para fusionarla a master)

See merge request !1
```
  5f02371e
- Merge branch 'master' into 'feature1' · 49bcf8c1
  Antonio Calero authored Jun 04, 2018
```
# Conflicts:
#   README.md
```
  49bcf8c1
- En paralelo modificamos master · abfdbc2c
  Antonio Calero authored Jun 04, 2018
  
  abfdbc2c
- Feature en rama · 80d926bb
  Antonio Calero authored Jun 04, 2018
  
  80d926bb
- Modificación de la rama principal · a6982f5f
  Antonio Calero authored Jun 04, 2018
  
  a6982f5f
02 Jun, 2018 1 commit
- added gitignore file · 42420265
  Antonio Calero authored Jun 02, 2018
  
  42420265
30 May, 2018 1 commit
- Este es el primer commit · 6787e3e6
  Antonio Calero authored May 30, 2018
  
  6787e3e6