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

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

Cargo.lock

Generated

+295 -159

File diff suppressed because it is too large Load Diff