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 6989a3b9b7fcb727e992964797c94ab2b3575ebd..ff101608acc152d056aaffa87ca72dd3c2a60920 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jul 15 07:23:15 CEST 2022
+Sun 05 Feb 2023 07:22:56 AM CET