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 0d8a6db45b19542a48461ee90471685c32a7dc6e..7c9d32de608dd8e812ed6f680afa2a14de928337 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Oct  2 07:24:00 CEST 2022
+Tue Oct  4 07:23:27 CEST 2022