Merge branch 'terencehill/shotgun_fixes' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 46114ef1a2be578865d2b2c29b929695ab86f8c6..2c63b30087c39e0e140db6d5f8eaa5f99168d160 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  8 07:23:14 CEST 2022
+Sun Sep 18 07:24:01 CEST 2022