X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=0e82268d6526270d46f35ead73425fac23788b4b;hb=ac7deb97b1a0e73ceea4684be73e72912fb3f1aa;hp=256958e3a4a386ed6c45495d89727dabc9d5dfaa;hpb=99d8ead3338901342e6a1bf429082796d35666d0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 256958e3a..0e82268d6 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Nov 30 07:23:45 CET 2020
+Mon Mar  1 07:23:49 CET 2021