Merge branch 'drjaska/balance/vortex' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 3a32be1a8a5952e022d29e10c716fa47115e1829..97d57c7b2c5c986fd0e535697c5d38e2d0c0e5ef 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Jun 24 07:23:45 CEST 2021
+Fri Jan  7 07:23:03 CET 2022