X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=fcac2b7f6e045feeca7fbaae3c8a26db82c775ae;hb=42cb64138ff49a9e5460cf3ffb98fb253206623c;hp=bc44bf275d8fbad12fdad958754b846c5cee12b5;hpb=fd8f8a153c6b9f55d5077307da69a011a0ca1514;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index bc44bf275..fcac2b7f6 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Apr  3 07:23:47 CEST 2021
+Sat May 15 07:23:49 CEST 2021