Merge pull request #24 from museoXela/master

khk
Merge pull request #53 from museoXela/master

ghjk
Merge pull request #15 from museoXela/master

sfdsdf
Merge pull request #170 from JEscalanteGT/master

Cambio en formulario de sala y guardado
Merge pull request #171 from victorbetha/master

Merge pull request #53 from museoXela/master
Merge pull request #54 from museoXela/master

fghjk
Clasificaciones mejoradas

dasda
Merge pull request #172 from Migue4/master

efsdf
Merge pull request #16 from museoXela/master

CDkj
Merge pull request #173 from Migue4/master

Merge pull request #16 from museoXela/master
Merge pull request #174 from victorbetha/master

Merge pull request #54 from museoXela/master
Merge pull request #55 from museoXela/master

xcfvgh
Merge pull request #175 from hC4stillo/master

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

m
ACTUALIZACION

Clase eventos
Merge pull request #176 from victorbetha/master

actualizacion
Eventos

sdasda
Merge pull request #177 from Migue4/master

Eventos
ACTUALIZACION

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