Merge pull request #24 from museoXela/master

khk
Merge pull request #175 from hC4stillo/master

Merge pull request #24 from museoXela/master
Merge pull request #25 from museoXela/master

m
Merge pull request #176 from victorbetha/master

actualizacion
Eventos

sdasda
Merge pull request #177 from Migue4/master

Eventos
Merge pull request #17 from museoXela/master

fgghjnm
ACTUALIZACION

Editor de fichas listo
Merge branch 'master' of https://github.com/museoXela/Desktop
fasdf

funcionan los 3 mas de instalaciones
Merge pull request #178 from hC4stillo/hcastillo/PutosTodos

Hcastillo/putos todos
Eventos2

Nuevos cambios
Merge pull request #179 from Migue4/master

Eventos2
Merge pull request #56 from museoXela/master

hjg