Merge branch 'terencehill/campaign_balance_fix' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index ee1c42f130f95c11c9d6f5580dd3488d9627375b..df5f27c1baedba93172f925a324e6ccc1995d9de 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Oct  5 07:24:30 CEST 2019
+Sat Dec 28 07:24:50 CET 2019