my change
new change
Merge branch 'develop' of github.com:obeddiaz/UPASystem into develop
newkey test
delete test change
archivos faltantes
añadir archivos faltantes
Merge remote-tracking branch 'remotes/origin/develop'
Merge remote-tracking branch 'remotes/origin/master' into develop
delete test
Merge remote-tracking branch 'remotes/origin/develop'