X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=4e3d23531803bb92806de9ee0a6b0e67a5974aa0;hb=83d5456d62665fd2e44b474be8fffac29ff9deca;hp=ff101608acc152d056aaffa87ca72dd3c2a60920;hpb=b1317ceb61ee2690d3d892945c1c0926c181db2b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index ff101608a..4e3d23531 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun 05 Feb 2023 07:22:56 AM CET
+Sun 28 May 2023 07:22:59 AM CEST