editar-producto
Merge branch 'master' of github.com:estrategasdigitales/nidorino

Conflicts:
	application/views/admin/editar-producto.php