From: Martin Taibr <taibr.martin@gmail.com>
Date: Sat, 20 Oct 2018 18:08:59 +0000 (+0000)
Subject: Merge branch 'Spike29/space-elevator_fix154' into 'master'
X-Git-Tag: xonotic-v0.8.5~94
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d6b5b58b4601276a08eb85b3cbe2efcd3eca1958;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Spike29/space-elevator_fix154' into 'master'

Add two missing patches below the map, fix #154

Closes #154

See merge request xonotic/xonotic-maps.pk3dir!126
---

d6b5b58b4601276a08eb85b3cbe2efcd3eca1958