Iconos del arbol de talentos
Merge branch 'scaffolding' of github.com:HackAcademy/hack into scaffolding
Merge branch 'scaffolding' of github.com:HackAcademy/hack into scaffolding
modificaciones en vistas
fix merge
Cambios previos a la tropicalizacion mexicana