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

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

diff --git a/.tx/merge-base b/.tx/merge-base
index d5c8aa735bea155daf3ab6e5f899b8eb29394beb..143144419996b561cfe4a73ee3eb14565bf56a07 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Jan 10 07:24:09 CET 2019
+Mon Jun 24 07:24:34 CEST 2019