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

diff --git a/.tx/merge-base b/.tx/merge-base
index 24b03de2f..8f3fd4209 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jan 28 07:23:07 CET 2022
+Tue Apr 12 07:23:16 CEST 2022