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 a90598bb3f2da203bf2266d3e7ec0b9091d9351f..a43f5bb0f27d7812b48ca6bec11fd18769d38dcf 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan 14 07:24:53 CET 2020
+Mon Mar 30 07:24:48 CEST 2020