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 18df019e6ae07ccaec6a58b61f58ddeee940909f..a7a5dfbddb5c22ef7f16bbc99e18215b752347cf 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Mar 31 07:23:48 CEST 2021
+Mon May 31 07:23:32 CEST 2021