Commit 2517c8a8 authored by Ivaria's avatar Ivaria

Merge branch 'master' into 'shadowlands'

# Conflicts:
#   .release/release.sh
parents c8697cad cacabce5
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