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 2506829b9c4e38d170d2c17bc5476c8269a4810b..0e82268d6526270d46f35ead73425fac23788b4b 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Dec 21 07:23:48 CET 2020
+Mon Mar  1 07:23:49 CET 2021