X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=037aa1c8127233f7b1b7485dc30e069e40b60419;hp=99d3daba257590ee6f6a14a9dbe82bb25b6f918c;hb=19c09c8cfc6a4cb71c07e63bf739b7720ec6b0a0;hpb=93e98e9d0187a81935aee4a2dfde8cb9410af67a

diff --git a/.tx/merge-base b/.tx/merge-base
index 99d3daba2..037aa1c81 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jul 17 07:23:57 CEST 2020
+Sat Jul 18 07:23:53 CEST 2020