Merge branch 'terencehill/scoreboard_ui' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 4493fd934b88149c7e59ccf845168bbe15fedeb0..4568336c5ccc16b2f17b9aad8d1c1a28a21b2bda 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Apr 13 07:23:07 CEST 2022
+Fri Jul 22 07:23:20 CEST 2022