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

diff --git a/.tx/merge-base b/.tx/merge-base
index 4318e20fc..560fb519d 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jan 31 07:24:57 CET 2021
+Wed May 26 07:23:50 CEST 2021