]> git.lizzy.rs Git - rust.git/commitdiff
Merge remote-tracking branch 'origin/master' into rustup
authorRalf Jung <post@ralfj.de>
Tue, 30 Oct 2018 07:40:30 +0000 (08:40 +0100)
committerRalf Jung <post@ralfj.de>
Tue, 30 Oct 2018 07:40:30 +0000 (08:40 +0100)
1  2 
src/lib.rs

diff --cc src/lib.rs
Simple merge