X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=01c17c1da2fec147244ca3d89244f2e68e1c2fbe;hb=0e93de78c8838e353255bc7ffe30434adbdd1c58;hp=8bc8c2217cc2bb2879d13035e8089d79758bc78c;hpb=2c8445638b9ae75471e86a6838d5b38ebb70efb0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 8bc8c2217c..01c17c1da2 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Mar 11 07:23:42 CET 2021
+Sun Jun 13 07:24:54 CEST 2021