Merge branch 'martin-t/deglob-log' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 7a7217d2572f0e8dc33ec3ff45b2c40937084d67..15b91cc93beaedd2dc0962e3c2d06f6a8b1b5c14 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jan 15 07:24:54 CET 2020
+Wed Apr  8 07:24:18 CEST 2020