X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=f8537985646d68b29f07e4c0d600646f13599fd7;hb=9c2f5ef44b8707cfa55f30da39c9d90b81c60738;hp=256958e3a4a386ed6c45495d89727dabc9d5dfaa;hpb=99d8ead3338901342e6a1bf429082796d35666d0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 256958e3a..f85379856 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Nov 30 07:23:45 CET 2020
+Fri Apr  9 14:55:12 CEST 2021