Merge remote-tracking branch 'upstream/master' into progress_handler

# Conflicts:
#	src/functions.rs
This commit is contained in:
gwenn 2020-10-29 19:46:49 +01:00
commit c7bf569359

Diff Content Not Available