Merge branch 'master' into Juhu/strafehud

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 188907c41507edd6dce4c81d5a790c16d87d3371..5737ecab2b51f47cab38994c1787e89d3111dce6 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Aug  4 07:23:45 CEST 2020
+Fri Oct  9 07:23:35 CEST 2020