X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;fp=.tx%2Fmerge-base;h=cad03ae669ccf13942c8bfdb86db840a17871dd4;hp=331a532e6591283995467bcdf61a3efb9314a509;hb=65b42258b7ca1edb2dfd2eaab05a7d65f2656c17;hpb=76e79272faee00964eaa71a0f6fdf6ec7bcf24e7

diff --git a/.tx/merge-base b/.tx/merge-base
index 331a532e65..cad03ae669 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Apr  7 07:23:07 CEST 2022
+Fri Apr  8 07:23:09 CEST 2022