Merge branch 'terencehill/race_cleanups' into 'master'

[xonotic/xonotic-data.pk3dir.git] / .tx / merge-base

diff --git a/.tx/merge-base b/.tx/merge-base
index 5737ecab2b51f47cab38994c1787e89d3111dce6..8bc8c2217cc2bb2879d13035e8089d79758bc78c 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct  9 07:23:35 CEST 2020
+Thu Mar 11 07:23:42 CET 2021