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 e43a3376bd7c9ce501c55180aba6ee526dcae448..97d57c7b2c5c986fd0e535697c5d38e2d0c0e5ef 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Dec 10 07:23:45 CET 2020
+Fri Jan  7 07:23:03 CET 2022