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 f7998cfd2f947dbcc69b7d70c39832f01c39900a..7c9d32de608dd8e812ed6f680afa2a14de928337 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Aug 28 07:23:56 CEST 2022
+Tue Oct  4 07:23:27 CEST 2022