From: Mario <mario.mario@y7mail.com>
Date: Tue, 8 Dec 2020 13:55:08 +0000 (+0000)
Subject: Merge branch 'Mario/crypto_linux' into 'master'
X-Git-Tag: xonotic-v0.8.5~80
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=6bc44ce2a31997897c575e920f57284a061d0099

Merge branch 'Mario/crypto_linux' into 'master'

Merge branch Mario/crypto_linux (XXS merge request)

See merge request xonotic/xonotic!74
---

6bc44ce2a31997897c575e920f57284a061d0099