Borro el archivo temporal
Gemfile
Gemfile y su madre
Merge branch 'development' of https://github.com/sbianchi/wira into development
config admin
Merge branch 'development' of github.com:sbianchi/wira into development
rm manifest
archivo de carga
me olvide de cosita
merge
Merge branch 'development' of github.com:sbianchi/wira into development
configuracion de admin
Merge branch 'development' of https://github.com/sbianchi/wira into development
soy un gil
Merge branch 'development' of https://github.com/sbianchi/wira into development
Quito darme de baja al editar mis datos
Si soy admin deberia ver los usuarios pero no borrarlos
el Agus aprende a mandar params bien
garbage
Merge branch 'development' of https://github.com/sbianchi/wira into development