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 9f1b31ded5a35a0ec72bc7b8196e0f755af698e3..de2591c13542d3ce6b0e2bb48af7d2e7ffb6a63a 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Jul 30 07:23:50 CEST 2020
+Sun Oct 18 07:24:53 CEST 2020