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

diff --git a/.tx/merge-base b/.tx/merge-base
index a1b38f814..31c765fff 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Mar 18 07:24:28 CET 2021
+Sun Jun 20 07:25:04 CEST 2021