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

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 0cd13217a121c2bed5460ba34bda8d11bfb2fecc..67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun 30 07:25:26 CEST 2019
+Thu Sep 12 07:24:50 CEST 2019