Merge branch 'master' into develop

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5a763f2cd1e923f626cdedf3be7204534ef531b..caf20d12527ad3a08a93669ec63e052c9f305392 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,7 +55,7 @@ test_sv_game:
     - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
     - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
 \r
-    - EXPECT=d4060caf37a2e60bab68d1f83bc57368\r
+    - EXPECT=a728d38448ae86459582804aa10320c0\r
     - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r
       | tee /dev/stderr\r
       | sed -e 's,^\[[^]]*\] ,,'\r