X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=a39a65b4dd2244d1033ea614f679619c10e6e0c2;hb=a9c224959e004db7da0c1454b15a1e4b770a5f17;hp=0a448742decc3f0211e9cd5a03db4d537d0e1ae1;hpb=579b98f2d87d5d2753618322ade31af1422d91ec;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 0a448742d..a39a65b4d 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Apr 20 07:23:45 CEST 2021
+Fri Jun  4 07:23:59 CEST 2021