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

diff --git a/.tx/merge-base b/.tx/merge-base
index 0661ec53f..999c3df8e 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Aug  9 07:23:33 CEST 2021
+Sat Nov 20 07:23:16 CET 2021