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

diff --git a/.tx/merge-base b/.tx/merge-base
index 4dc3db19a..31c765fff 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Feb 27 07:23:43 CET 2021
+Sun Jun 20 07:25:04 CEST 2021