Merge branch 'terencehill/minplayers_per_team' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index ca7140deb4f39043ced90c760624d498c0f1b2a1..38ac59cba34a1f0cd11cf2c71fc3c4e4aff90e10 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun 20 07:24:25 CEST 2018
+Thu Feb  7 07:24:09 CET 2019