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

diff --git a/.tx/merge-base b/.tx/merge-base
index c356e57e0..0e82268d6 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Oct 26 07:23:34 CET 2020
+Mon Mar  1 07:23:49 CET 2021