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

diff --git a/.tx/merge-base b/.tx/merge-base
index 3352dc239..d39a1e537 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jan 23 07:23:43 CET 2021
+Sat Jun  5 07:23:46 CEST 2021