Cambios jum?
errores merge
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
actualizacion formularios
Merge remote-tracking branch 'upstream/master'
merge stilos
merge-borrado dump no se que
stylus boton de salir
corridos errores
Merge remote-tracking branch 'upstream/master'
variable login
conflicto index.jade
Merge pull request #69 from josedeweb/master

Variable para login