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

diff --git a/.tx/merge-base b/.tx/merge-base
index 8a1b9e391..4e3d23531 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jan 25 07:23:31 CET 2023
+Sun 28 May 2023 07:22:59 AM CEST