Merge branch 'marin-t/bot-badcvar' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index d89ad5cbefe69855899a645ea0fb4d24faf439f4..0a2007ba150b66748c48a4ac51c7ab07f7d7d446 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Feb  8 07:24:17 CET 2020
+Tue Apr  7 07:24:15 CEST 2020