Merge branch 'master' into terencehill/scoreboard_item_stats

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 615dd52c39dba7579f266d74008786fbef6b543b..de2591c13542d3ce6b0e2bb48af7d2e7ffb6a63a 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jul 26 07:24:53 CEST 2020
+Sun Oct 18 07:24:53 CEST 2020