X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=3ea4651091cad2546f31cc9cf7463b056eb75855;hb=HEAD;hp=b2ce294c1ba76b0b6943ae16b67a7772bd17cffd;hpb=f73f6db19157cdd7f67ebbadfe616eb5bab1bc6e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index b2ce294c1..71a1bf6a4 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Apr  1 07:22:55 AM CEST 2024
+Thu Jun 13 07:23:01 AM CEST 2024