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

diff --git a/.tx/merge-base b/.tx/merge-base
index 592a083cd..560fb519d 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon May  3 07:23:38 CEST 2021
+Wed May 26 07:23:50 CEST 2021