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

diff --git a/.tx/merge-base b/.tx/merge-base
index 8f3fd4209..08bd4e98e 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Apr 12 07:23:16 CEST 2022
+Sat Jul  9 07:23:10 CEST 2022