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 ac3913de4e8e1929187fb7da278918cab3528950..aa572310535b3d19e4131e0fa907e2563a689122 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Apr 30 07:23:50 CEST 2018
+Wed May 30 07:24:39 CEST 2018