Commits · 5f02371ed889a61e6bcb5b878c36d241b0e2ddce · Antonio Calero / formacion

04 Jun, 2018 5 commits
- 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