Merge branch 'bones_was_here/strafehud_jumpheight' into Juhu/strafehud-fixes

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

diff --git a/.tx/merge-base b/.tx/merge-base
index e3d0c795dcb8c1f1f23afb07a1254ef8d6a77e76..894b2e1713e0464fde403ada1403d46a419eddf7 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun May  2 07:24:54 CEST 2021
+Mon Oct 11 07:23:13 CEST 2021