Commit 9e7e4dfe authored by Ivaria's avatar Ivaria

Merge branch 'master' into 'shadowlands'

# Conflicts:
#   .pkgmeta
parents 7177ef00 e1855909
......@@ -31,3 +31,4 @@ externals:
move-folders:
VuhDo/VuhDoOptions: VuhDoOptions
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