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

diff --git a/.tx/merge-base b/.tx/merge-base
index 3f4306972..999c3df8e 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon May 17 07:23:39 CEST 2021
+Sat Nov 20 07:23:16 CET 2021