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 8fcfd20c36f3360d68713be4b28615d7d5ac522a..8f3fd420949a286c6dd95a9806bb853b14a1493e 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Mar  8 07:23:08 CET 2022
+Tue Apr 12 07:23:16 CEST 2022