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

diff --git a/.tx/merge-base b/.tx/merge-base
index 5737ecab2..fcac2b7f6 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct  9 07:23:35 CEST 2020
+Sat May 15 07:23:49 CEST 2021