Merge branch 'master' into 'export_progress'

# Conflicts: # disk.py

Merge branch 'master' into 'export_progress'
# Conflicts: # disk.py
b929e74e · Szeberényi Imre · 731fb5d5 · 8f4918e4 · b929e74e
Commit b929e74e authored Jan 26, 2021 by Szeberényi Imre
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

disk.py
+2 -0

No files found.
--- a/disk.py
+++ b/disk.py
+import shutil
+
 import json
 import shutil