Merge branch 'master' into terencehill/welcome_dialog_translatable

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 7cfe048e9f8b68967c352d7d812dc6ade82c5fc9..8f3fd420949a286c6dd95a9806bb853b14a1493e 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Mar 28 07:23:08 CEST 2022
+Tue Apr 12 07:23:16 CEST 2022