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 40e914ad627fcb44eb74dc4843cfb58edaebb647..cfd0804de4f83abd996cf3e7cf78000afcb39665 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri 21 Jul 2023 07:22:59 AM CEST
+Sun Jun  2 07:22:59 AM CEST 2024