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

diff --git a/.tx/merge-base b/.tx/merge-base
index 3352dc239..a39a65b4d 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jan 23 07:23:43 CET 2021
+Fri Jun  4 07:23:59 CEST 2021