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 f04ca256b222910fb9b903a026a5b463ec99c7fc..ff101608acc152d056aaffa87ca72dd3c2a60920 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Jan 26 07:23:35 CET 2023
+Sun 05 Feb 2023 07:22:56 AM CET