X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=1bd042c0958f89ca5907ffac23eef7410f5393f3;hb=c363ffc6ee8bbfa8571b926f06642b5d817370fe;hp=897d0a59b62f948e587ec01ebc4511c0b94d6c20;hpb=fbd3279e575e41377901f1536e14fe45e540405b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 897d0a59b..1bd042c09 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jun  6 07:23:17 CEST 2022
+Fri Jun 17 07:23:08 CEST 2022