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 4838342ff5ace636b2eff7a716129e6970249b58..0e82268d6526270d46f35ead73425fac23788b4b 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Nov  8 07:25:06 CET 2020
+Mon Mar  1 07:23:49 CET 2021