Commit 9e386244204c5948acb5abdfaf8c5a9475cfa1b8

Authored by Jose Pinto
Exists in master and in 1 other branch develop

Merge branch 'master' into 'develop'

Master

See merge request !43
... ... @@ -42,10 +42,7 @@
42 42 "foca-modal-cotizacion": "git+http://git.focasoftware.com/npm/foca-modal-cotizacion.git",
43 43 "foca-modal-domicilio": "git+http://git.focasoftware.com/npm/foca-modal-domicilio.git",
44 44 "foca-modal-flete": "git+http://git.focasoftware.com/npm/foca-modal-flete.git",
45   - "foca-modal-moneda": "git+http://git.focasoftware.com/npm/foca-modal-moneda.git",
46 45 "foca-modal-precio-condiciones": "git+http://git.focasoftware.com/npm/foca-modal-precio-condiciones.git",
47   - "foca-modal-proveedor": "git+http://git.focasoftware.com/npm/foca-modal-proveedor.git",
48   - "foca-modal-vendedores": "git+http://git.focasoftware.com/npm/foca-modal-vendedores.git",
49 46 "foca-seguimiento": "git+http://git.focasoftware.com/npm/foca-seguimiento.git",
50 47 "font-awesome": "^4.7.0",
51 48 "gulp": "^3.9.1",