Merge branch 'martin-t/testing-balance' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 7a7217d2572f0e8dc33ec3ff45b2c40937084d67..a43f5bb0f27d7812b48ca6bec11fd18769d38dcf 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jan 15 07:24:54 CET 2020
+Mon Mar 30 07:24:48 CEST 2020