Merge branch 'terencehill/mapvote_winnermap' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 1c8c6170787d6e2370f962b03539edd459777abd..7c9d32de608dd8e812ed6f680afa2a14de928337 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Sep 25 07:23:59 CEST 2022
+Tue Oct  4 07:23:27 CEST 2022