X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=13add5705d368fd5539cbea6ca3fbd43cdf2a45c;hb=edba296e94522052e2e85e1c6132b7a7992c0a29;hp=fcac2b7f6e045feeca7fbaae3c8a26db82c775ae;hpb=ad328f3deda4a9825f27a878ca81dc7f339e6d30;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index fcac2b7f6..13add5705 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat May 15 07:23:49 CEST 2021
+Sun Aug  1 07:24:34 CEST 2021