Merge branch 'master' into Mario/survival

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

diff --git a/.tx/merge-base b/.tx/merge-base
index ef2b4ce1a7d551e23360d7abe892a82afce85f8c..1ee7cdb840b5e5535b405de0d0d8c246c5c47b00 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jul  7 07:23:45 CEST 2020
+Tue Aug 25 07:23:38 CEST 2020