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

diff --git a/.tx/merge-base b/.tx/merge-base
index e525fd0a8..1bd042c09 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Mar 17 07:23:07 CET 2022
+Fri Jun 17 07:23:08 CEST 2022