merge joseluisgonzalezgalvez/peces.git master
merge joseluisgonzalezgalvez/peces.git master
merge jluis
Merge branch 'joseluisgonzalezgalvez-master'
Merge remote-tracking branch 'upstream/master'
actualizando dump
Merge remote-tracking branch 'upstream/master'
Se eliman utf8_decode, y se agrega enlace a las fichas del index