Merge branch 'master' into terencehill/min_spec_time

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

diff --git a/.tx/merge-base b/.tx/merge-base
index a970a2bba16d07544d823d884563e90be655fd04..431dcbe974dc57728a788a275a92bcbc985444ca 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun May  7 07:23:48 CEST 2017
+Sat Mar 17 07:23:46 CET 2018