Merge branch 'master' into Mario/stepdown_maxspeed

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 15b91cc93beaedd2dc0962e3c2d06f6a8b1b5c14..76b17ee0d96cbfc3d0e9f6020d21617e2e0f24b3 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Apr  8 07:24:18 CEST 2020
+Wed May 13 07:23:38 CEST 2020