Merge branch 'terencehill/damage_for_suicide' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index f8537985646d68b29f07e4c0d600646f13599fd7..a7a5dfbddb5c22ef7f16bbc99e18215b752347cf 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Apr  9 14:55:12 CEST 2021
+Mon May 31 07:23:32 CEST 2021