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

diff --git a/.tx/merge-base b/.tx/merge-base
index c214fcfbd..fcac2b7f6 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Jul  2 07:23:39 CEST 2020
+Sat May 15 07:23:49 CEST 2021