X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=04eea967b08d5f4ac8f0077b3d62f77a75bc6c2b;hb=d3b8b5175f4c5fcbea62a0b55881d61f08e2a840;hp=3ffbcef9155ab88c80cdd8dedb28137e844f6c94;hpb=4c00c3ca13bd559eb1411528254326ff55959a9a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 3ffbcef91..04eea967b 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Nov 16 07:23:12 CET 2021
+Sun Mar 20 07:23:40 CET 2022