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 committed 2018-11-19 19:52:43 +01:00

2 parents f84cbeaaf8 1d4944b88e

commit 5edbd0e952

8 files changed

+594 -166

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

No files matched your search

Cargo.lock

Generated

+295 -159

File diff suppressed because it is too large. Load diff