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 e43a3376bd7c9ce501c55180aba6ee526dcae448..a7a5dfbddb5c22ef7f16bbc99e18215b752347cf 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Dec 10 07:23:45 CET 2020
+Mon May 31 07:23:32 CEST 2021