X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=31c765fff004dbbefe7bb7ba7d5ddfd87b6dea9f;hb=e3c74a79d79d39285f3fe763c77522321340ac52;hp=fad0ce25a6994c5ec7d6c716a53684a2c1b058af;hpb=5d7aebf30f5605ecef1bfa299e448eb07fba3ea8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index fad0ce25a..31c765fff 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Mar 15 07:23:52 CET 2021
+Sun Jun 20 07:25:04 CEST 2021