X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=8f3fd420949a286c6dd95a9806bb853b14a1493e;hb=d17fba96da03896d8f439bb89aa7f17895150488;hp=d65a22b1cd0a7aa8ac5d0ffd153c77791a7a6174;hpb=0a288c65f29bbf9d68fa15e8df7aa774fab95c5e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index d65a22b1c..8f3fd4209 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Dec 27 07:23:03 CET 2021
+Tue Apr 12 07:23:16 CEST 2022