X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;fp=.tx%2Fmerge-base;h=d39a1e537b98f32267e63dd8d0d72b898aac3412;hp=a39a65b4dd2244d1033ea614f679619c10e6e0c2;hb=cec1279555390bc9d77cb3088f7d3499477b249f;hpb=a9c224959e004db7da0c1454b15a1e4b770a5f17

diff --git a/.tx/merge-base b/.tx/merge-base
index a39a65b4dd..d39a1e537b 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jun  4 07:23:59 CEST 2021
+Sat Jun  5 07:23:46 CEST 2021