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

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 9bae7e1cd52108d1e3cb14b7f872ea63e693c7be..3512ca5dc542939aff93cadaafcc1544cf16655e 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu May 17 07:24:26 CEST 2018
+Sun Sep 30 07:24:04 CEST 2018