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 f53fda730be7eb97ed7fe342426c2cf175efd033..2c63b30087c39e0e140db6d5f8eaa5f99168d160 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Sep  5 07:23:25 CEST 2022
+Sun Sep 18 07:24:01 CEST 2022