Merge branch 'master' into terencehill/less_entities

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 10f5bb16fa75b8b1be0fc637a4278e756fb54d15..0e82268d6526270d46f35ead73425fac23788b4b 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jul 31 07:23:47 CEST 2020
+Mon Mar  1 07:23:49 CET 2021