Merge remote-tracking branch 'origin/fix.amigos' into Fix-style
Algunos cambios en el style
Mas cambios de estilo...
No funciona, buscar solucion...
Merge branch 'master' into Fix-style
Merge commit '5f2e7c0ccfc165d6428e3e9ee6b53a74ee6bd632'
Merge remote-tracking branch 'SocialNetwork/Fix-style'
Merge remote-tracking branch 'SocialNetwork/master'