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

diff --git a/.tx/merge-base b/.tx/merge-base
index 1930c781e..560fb519d 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun May 23 07:25:48 CEST 2021
+Wed May 26 07:23:50 CEST 2021