Merge branch 'master' into Mario/rain_fix

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

diff --git a/.tx/merge-base b/.tx/merge-base
index f7f21ad1f962dfeea3405965d3a7a551253ef64e..7a7217d2572f0e8dc33ec3ff45b2c40937084d67 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Nov 16 07:24:35 CET 2019
+Wed Jan 15 07:24:54 CET 2020