Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master'
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
  • Loading branch information
joseluisgs committed Nov 26, 2020
2 parents 9842a59 + 04bfe08 commit a1e9c03
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ s

## Licencia

Este proyecto esta licenciado bajo licencia **MIT**, si desea saber más, visite el fichero [LICENSE](https://github.com/joseluisgs/docker-tutorial/blob/master/LICENS) para su uso docente y educativo.
Este proyecto esta licenciado bajo licencia **MIT**, si desea saber más, visite el fichero [LICENSE](https://github.com/joseluisgs/docker-tutorial/blob/master/LICENSE) para su uso docente y educativo.

0 comments on commit a1e9c03

Please sign in to comment.