Merge branch 'master' into rocket-0.4

Browse source

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	src/api/core/mod.rs

...

This commit is contained in:

Daniel García 2018-11-19 19:52:43 +01:00

parent f84cbeaaf8 1d4944b88e

commit 5edbd0e952

No known key found for this signature in database

GPG key ID: FC8A7D14C3CD543A

8 changed files with 594 additions and 166 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

454

Cargo.lock generated

View file

File diff suppressed because it is too large Load diff