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 cbd841d70fd79b81ce6e51683a0217cc51ff98ee..a43f5bb0f27d7812b48ca6bec11fd18769d38dcf 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Nov  7 07:24:24 CET 2019
+Mon Mar 30 07:24:48 CEST 2020