]> git.proxmox.com Git - cargo.git/commit
Auto merge of #4920 - wking:license-expression, r=matklad
authorbors <bors@rust-lang.org>
Mon, 8 Jan 2018 19:11:39 +0000 (19:11 +0000)
committerbors <bors@rust-lang.org>
Mon, 8 Jan 2018 19:11:39 +0000 (19:11 +0000)
commitf60ece98c10aa3716d037524da4ee989e212fe19
tree59bafc86b3f94fec7ea30324aa1546fde88ce52e
parentc4003c4fbb2cb780a5545c540dc75688684f6788
parent4977c4c04132594c4b8ab4fe88c1c8f3f60f6f55
Auto merge of #4920 - wking:license-expression, r=matklad

Cargo.toml: Replace '/' with 'OR' in 'license'

Catch up with our recommendations from 7dee65fe (#4898), which deprecated `/` in favor of vanilla SPDX license expressions.

I've gone with the disjunctive `OR`, because the README has:

> Cargo is primarily distributed under the terms of both the MIT license and the Apache License (Version 2.0).
Cargo.toml