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 b2fa2886e25a22526df24f39c8fcf064ea12c914..3512ca5dc542939aff93cadaafcc1544cf16655e 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun May 13 07:24:13 CEST 2018
+Sun Sep 30 07:24:04 CEST 2018