From: terencehill <piuntn@gmail.com>
Date: Sat, 4 Jun 2022 21:05:48 +0000 (+0000)
Subject: Merge branch 'z411/welcome_join' into 'master'
X-Git-Tag: xonotic-v0.8.5~21
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=124cfa2b59a3239f6232e29d0437b0781a872fad;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'z411/welcome_join' into 'master'

Add join button to Welcome dialog and make it default

See merge request xonotic/xonotic-data.pk3dir!1021
---

124cfa2b59a3239f6232e29d0437b0781a872fad