X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=999c3df8ea0f0419fd185e0fe70dd0e72089890b;hb=d9877a41f2f1371095f691972914b820fda527a5;hp=fea366fda43b57e0369624503c24402708d9b2e8;hpb=44206d0c50c5cdd9baad0152f6695a83135891e8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index fea366fda..999c3df8e 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jun 21 07:23:43 CEST 2021
+Sat Nov 20 07:23:16 CET 2021