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 f7b36c64b10552b24e839f82fe4099a0d8cbaf22..324a74c035a73eaed64e84fc0acd8447d585f6d6 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Dec  1 07:23:18 CET 2022
+Tue Dec 27 07:23:39 CET 2022