X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=4759f3290203adadb5deea1743f273e66a5f2001;hb=0656dcf67854525e7f6557680d368d461c8e4803;hp=80f914b27a687b382dc7848e0e8fb7609a655144;hpb=cb22333c757fd1cd6efe105c78a3838864ab84f5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 80f914b27..4759f3290 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Feb  2 07:23:56 CET 2021
+Sun Apr 18 07:24:45 CEST 2021