Skip to content
Commit 5ea39d4c authored by minicom's avatar minicom
Browse files

Merge commit '93aae371' into feature-directml 

# Conflicts:
#	modules/base.py
#	translate/ko_KR.qm
#	translate/ko_KR.ts
parents c6dd94d0 93aae371
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment