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 a385ce7f9261a8027df95fddbc91b85f1aa26844..1ee7cdb840b5e5535b405de0d0d8c246c5c47b00 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jul 22 07:23:44 CEST 2020
+Tue Aug 25 07:23:38 CEST 2020