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

diff --git a/.tx/merge-base b/.tx/merge-base
index 2814404d7..8f3fd4209 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Dec  3 07:23:13 CET 2021
+Tue Apr 12 07:23:16 CEST 2022