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

diff --git a/.tx/merge-base b/.tx/merge-base
index 90ec1b7cc..71a1bf6a4 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Mar 25 07:22:57 AM CET 2024
+Thu Jun 13 07:23:01 AM CEST 2024