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 27d0db5ace70b7062d64d3138ea86384f87ba81f..a43f5bb0f27d7812b48ca6bec11fd18769d38dcf 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jul 30 07:24:47 CEST 2019
+Mon Mar 30 07:24:48 CEST 2020