Merge branch 'martin-t/vote' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index de1b13bbc4bbd2a4a0a99a0aa88b1f9d9c69f101..1bafc5c83e378fd9504d6b661cb2217cbdb2c3a3 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Oct  6 07:24:28 CEST 2019
+Mon Feb 17 07:24:21 CET 2020