projects / cargo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e5562dd 002996e)
Merge branch 'credentials-hosts' of github.com:dethoter/cargo into registry-login
authorChris Swindle <christopher.swindle@metaswitch.com>
Thu, 26 Oct 2017 13:54:13 +0000 (14:54 +0100)
committerChris Swindle <christopher.swindle@metaswitch.com>
Thu, 26 Oct 2017 13:54:13 +0000 (14:54 +0100)
commite911a25f42030df8a6a93c6adc937066fce93795
tree36965656519d3dbd57019f122b82e0621073bc52tree | snapshot
parente5562ddb061b8eb5a0e754d702f164a1d42d0a21commit | diff
parent002996eb6baf93d3a43c9c433049de0298d3dcb1commit | diff
Merge branch 'credentials-hosts' of github.com:dethoter/cargo into registry-login

Conflicts:
src/bin/login.rs
src/cargo/ops/registry.rs
tests/login.rs
tests/publish.rs
src/bin/login.rs diff1 | diff2 | blob | history
src/cargo/core/source/source_id.rs diff1 | | blob | history
src/cargo/ops/registry.rs diff1 | diff2 | blob | history
src/cargo/util/config.rs diff1 | diff2 | blob | history
tests/login.rs diff1 | diff2 | blob | history
tests/publish.rs diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.