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 3a4e4ac57e560b6272aaf82d657cffd8b24fa25f..ff101608acc152d056aaffa87ca72dd3c2a60920 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Dec  9 07:23:30 CET 2022
+Sun 05 Feb 2023 07:22:56 AM CET