Merge branch 'bones_was_here/warmup' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 5b3397d71c7db3972b45aa3193e59c7c8758d127..ff101608acc152d056aaffa87ca72dd3c2a60920 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Sep 11 07:23:56 CEST 2022
+Sun 05 Feb 2023 07:22:56 AM CET