X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=a3b74888d22f294a4ece909a299937c62cb2d575;hb=8b12ff5889a7a23a5ddb063a81c06db599642f2d;hp=39b3b22839f5c9d6ac05ac583d4804e1e5e9e376;hpb=4f45739a7d0f47ea92e42f214a6f4a3e532aef39;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 39b3b2283..a3b74888d 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Nov 16 07:23:43 CET 2020
+Sun Apr  4 07:24:52 CEST 2021