Merge branch 'bones_was_here/team_selection_compatibility' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index a734f5abdd8069a1cb49c0e7c1469c23456c8b71..d487e5941b0a45c10644b0895fdbae5695c6164c 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Apr 11 07:24:09 CEST 2022
+Wed Aug 10 07:23:12 CEST 2022