X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=fad0ce25a6994c5ec7d6c716a53684a2c1b058af;hb=5d7aebf30f5605ecef1bfa299e448eb07fba3ea8;hp=4052e8e45745dc7fc841bf1b75c4e52c9c617454;hpb=fe710f61f1927b2f26e4f40b2dc2387ba83493b2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 4052e8e45..fad0ce25a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Nov 13 07:23:32 CET 2020
+Mon Mar 15 07:23:52 CET 2021