Merge branch 'z411/ctf_notif_fix' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index e8d9bdfae8cdf11a55e2025869d61067189a4324..324a74c035a73eaed64e84fc0acd8447d585f6d6 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct 21 07:23:25 CEST 2022
+Tue Dec 27 07:23:39 CET 2022