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 87d4e9aa2f08e869d25154c89e22c3a7d6e401ec..143144419996b561cfe4a73ee3eb14565bf56a07 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan 29 07:24:13 CET 2019
+Mon Jun 24 07:24:34 CEST 2019