merge conflicts
Servicio para escanear QR
nada
Merge branch 'master' of https://github.com/arturokunder/kd-menu into qrcodes
removed code from login view
plain view
Merge branch 'qrcodes' into order-status
scanner integrated
order-status
nada
merge conflict
review order
diteils
Merge branch 'order-status' of github.com:narisso/kd-menu into order-status