Merge branch 'master' into terencehill/scoreboard_ui

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

diff --git a/.tx/merge-base b/.tx/merge-base
index c5d98d6a2c679983e34c3143ae5d5d9965652ce1..13add5705d368fd5539cbea6ca3fbd43cdf2a45c 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jun 22 07:23:37 CEST 2021
+Sun Aug  1 07:24:34 CEST 2021