Merge remote-tracking branch 'upstream/master' into add_docs
authorRichard Dodd <richard.dodd@itp-group.co.uk>
Mon, 2 Oct 2017 12:37:40 +0000 (13:37 +0100)
committerRichard Dodd <richard.dodd@itp-group.co.uk>
Mon, 2 Oct 2017 12:37:40 +0000 (13:37 +0100)
commit8cab274319ae3a539c74687e1c53fa59c063790e
treee4b7dd2116cda4048231e34fae3651256377b548
parent624f9dbce91f08731636e3b81bd196d732cb9ff3
parentd7e3b7f24265016c9ce4455504b914dc92c92b07
Merge remote-tracking branch 'upstream/master' into add_docs
Cargo.lock
src/cargo/core/package.rs