css files
schema.rb conflict
Merge remote-tracking branch 'origin/SebastianAspen' into SebastianAspen
modelo de alertas
Merge branch 'SebastianAspen' of https://github.com/sebastiancastiblanco/aspen4 into SebastianAspen
Merge branch 'SebastianAspen' into alexAspen
alertas
Merge branch 'SebastianAspen' of https://github.com/sebastiancastiblanco/aspen4 into SebastianAspen
route merge
alerta form
Merge remote-tracking branch 'origin/SebastianAspen' into SebastianAspen
merge from SebastianAspen
intento de fechas
alertas index
Merge remote-tracking branch 'origin/SebastianAspen' into SebastianAspen
merge conflicts
error con metodo fundation, funciona jquery ien en fechas
alertas crud
Merge remote-tracking branch 'origin/SebastianAspen' into SebastianAspen
merged con SebantianAspen