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 8e5f2c73fc107746321a4462e83e1be4a1ff69e6..de2591c13542d3ce6b0e2bb48af7d2e7ffb6a63a 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Aug  1 07:23:42 CEST 2020
+Sun Oct 18 07:24:53 CEST 2020