X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=e43a3376bd7c9ce501c55180aba6ee526dcae448;hb=7f8c19051dadd84ab83cc4eacec6c18c402b9c52;hp=037aa1c8127233f7b1b7485dc30e069e40b60419;hpb=4efe03bff28c2a206565f259ee08288c7846fc6e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 037aa1c81..e43a3376b 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jul 18 07:23:53 CEST 2020
+Thu Dec 10 07:23:45 CET 2020