X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=560fb519d8cf9f163bb417c216294003f9c1694b;hb=1f775293e229ce85340e3b6aefb863e6afee14cd;hp=047efc1b98f0b50eddd0272519d04e92764b482e;hpb=8f40838abb1344e03fa5fdcabb14b6bdcfde1eb4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 047efc1b9..560fb519d 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Dec 19 07:23:35 CET 2020
+Wed May 26 07:23:50 CEST 2021