antes del merge general
Merged
LOST :S
Merge branch 'desarrollo_jose' of https://github.com/jgabrielsk8/SACE into dj
Merge branch 'desarrollo_jose' of https://github.com/jgabrielsk8/SACE into dj
Done
Filter Para Lo de la Ley de Educacion
Merge branch 'desarrollo_jose' of https://github.com/jgabrielsk8/SACE into dj
Merge branch 'desarrollo_jose' of https://github.com/jgabrielsk8/SACE into dj
certificado basica
boetas
MERGED
TODO YA
pruebas
Merge branch 'pulled' into desarrollo_rolando