Merge branch 'master' of https://gt stlab.uv.es/camonan/formacion

xplain why this merge is necessary,

Merge branch 'master' of https://gt stlab.uv.es/camonan/formacion
xplain why this merge is necessary,
c98895e5 · Victor Garcia Pau · 484068c4 · cf9e7ead · c98895e5
Commit c98895e5 authored Jun 05, 2018 by Victor Garcia Pau
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

jfo.txt jfo.txt +1 -0

No files found.
--- a/jfo.txt
+++ b/jfo.txt
+codigo generado, Julio