Restrict the timelimit vote to values between timelimit_min and timelimit_max

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 87d4e9aa2f08e869d25154c89e22c3a7d6e401ec..67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan 29 07:24:13 CET 2019
+Thu Sep 12 07:24:50 CEST 2019