The UN commission has reclassified cannabis, removing it from its most strict drug control list.
Cannabis had been on that list for 59 years.
The UN vote follows a recommendation from the WHO.
The health agency cited the drug's therapeutic benefits in the treatment of some illnesses.
Cannabis is still largely illegal in many countries.
However, the reclassification will open up greater research and development in the drug's potential medical uses.