Merge branch 'drjaska/frozenarcfix' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 785b420a47fbd51579b42de60b4f42a5a90b4ebc..46114ef1a2be578865d2b2c29b929695ab86f8c6 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Apr 19 07:23:07 CEST 2022
+Wed Jun  8 07:23:14 CEST 2022