Merge branch 'Juhu/strafehud-fixes' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index e1ffb97e3f3060a4071196e4a9b5bee38a71fcc8..4445fc56eada44c2a1f9cd40d459bac56e28ab3f 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Dec  4 07:24:05 CET 2022
+Sun 02 Apr 2023 07:22:58 AM CEST