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 c0c56123893d77228a0ff721ec4ec85a9937cf68..df5f27c1baedba93172f925a324e6ccc1995d9de 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon May 20 07:24:21 CEST 2019
+Sat Dec 28 07:24:50 CET 2019