cambios app contenidos
contratos
Merge branch 'pre-master' of https://github.com/valeraovalles/sait into pre-master
cualquier cosa
cambios app contratos
contratoscontroller
contratos
contratos
Merge branch 'jhoan' into pre-master
directorio
Merge branch 'jhoan' of https://github.com/valeraovalles/sait into jhoan
Merge branch 'jhoan' into pre-master
directorio
sss
Merge branch 'pre-master' into jhoan
combino con pre-master
Merge branch 'master' into jhoan