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 7ec08f73661d5c1504e116996cedbfb539dbeeb0..76b17ee0d96cbfc3d0e9f6020d21617e2e0f24b3 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat May  9 07:23:55 CEST 2020
+Wed May 13 07:23:38 CEST 2020