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 803036b6a9ca294200d18ad67bfe918459f45c82..76b17ee0d96cbfc3d0e9f6020d21617e2e0f24b3 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Mar  6 07:24:27 CET 2020
+Wed May 13 07:23:38 CEST 2020