From: Mario <zacjardine@y7mail.com>
Date: Wed, 7 Mar 2018 08:31:51 +0000 (+0000)
Subject: Merge branch 'marin-t/contributing' into 'master'
X-Git-Tag: xonotic-v0.8.5~179
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b3db400c6eef63359d9aa9ff3693d7238a75ac0f;p=xonotic%2Fxonotic.git

Merge branch 'marin-t/contributing' into 'master'

Contributing in readme

See merge request xonotic/xonotic!28
---

b3db400c6eef63359d9aa9ff3693d7238a75ac0f