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

diff --git a/.tx/merge-base b/.tx/merge-base
index d3611b785..560fb519d 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Nov 19 07:23:51 CET 2020
+Wed May 26 07:23:50 CEST 2021