Merge branches 'desarrollo' and 'master' into desarrollo
Merge branches 'haml' and 'master' into haml
Cambiando identación de haml y cambiando anwser por answer
Merge branches 'master' and 'haml'
Merge branches 'desarrollo' and 'master' into desarrollo
Añadida frase a mostrar
Merge branches 'master' and 'desarrollo'