Merge branch 'cargo-update' into 'master'

upgrade dependencies

See merge request veloren/veloren!267
This commit is contained in:
Joshua Barretto 2019-06-29 15:48:19 +00:00
commit b1e882cb5d

667
Cargo.lock generated

File diff suppressed because it is too large Load Diff