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 a1b38f8148ccbd30c4307c1124dc770bc5a29a18..13add5705d368fd5539cbea6ca3fbd43cdf2a45c 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Mar 18 07:24:28 CET 2021
+Sun Aug  1 07:24:34 CEST 2021