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 7f13450727b2dff9b9c5ad3a58c0f55cfdc398f4..d487e5941b0a45c10644b0895fdbae5695c6164c 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Aug  6 07:23:14 CEST 2022
+Wed Aug 10 07:23:12 CEST 2022