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