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 22200e07fbaa96b1573a6e7d479516e053fabd01..3512ca5dc542939aff93cadaafcc1544cf16655e 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jul 14 07:24:18 CEST 2018
+Sun Sep 30 07:24:04 CEST 2018