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

diff --git a/.tx/merge-base b/.tx/merge-base
index cad03ae66..1bd042c09 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Apr  8 07:23:09 CEST 2022
+Fri Jun 17 07:23:08 CEST 2022