X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=d39a1e537b98f32267e63dd8d0d72b898aac3412;hb=cec1279555390bc9d77cb3088f7d3499477b249f;hp=a3b74888d22f294a4ece909a299937c62cb2d575;hpb=d2f4a817b00681f6d86bef1f38e2bc739062aca8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index a3b74888d..d39a1e537 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Apr  4 07:24:52 CEST 2021
+Sat Jun  5 07:23:46 CEST 2021