Commit 7baec7dd authored by Brli's avatar Brli

Merge branch 'master' into 'master'

# Conflicts:
#   src/iso.py
parents 3c0b8bc9 8a4c5ee6
Pipeline #1387 skipped with stages
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment