Merge branch 'LuisOlaya' into pruebas
|
---|
.DS_Store |
---|
Not supported
|
.gitignore 0 → 100644 |
---|
img/.DS_Store |
---|
Not supported
|
img/img_wd/bg_stand_argentina.png 0 → 100644 |
---|
|
img/img_wd/bg_stand_colombia.png 0 → 100644 |
---|
|
img/img_wd/bg_stand_experiencias.png 0 → 100644 |
---|
|
img/img_wd/bg_stand_juegos.png 0 → 100644 |
---|
|
img/img_wd/bg_stand_mexico.png 0 → 100644 |
---|
|
img/logo_astellas.png |
---|
|
img/logo_astellas2.png 0 → 100644 |
---|
|
index.php |
---|
views/agenda.php |
---|
views/auditorio.php |
---|
views/chat.php |
---|
views/concursos.php |
---|
views/dia.php |
---|
views/home.php |
---|
views/juego.php |
---|
views/menu.php |
---|
views/modal.php |
---|
views/mostrar_imagen.php 0 → 100644 |
---|
views/muestra.php |
---|
views/salones.php |
---|
views/secciones.php |
---|
views/stand.php |
---|