Merge branch 'terencehill/bot_target_push' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 138e9f4faa4dc8a50c66a92b3cdc569e9f901079..cfd0804de4f83abd996cf3e7cf78000afcb39665 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Nov 12 07:23:04 AM CET 2023
+Sun Jun  2 07:22:59 AM CEST 2024