X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=10f5bb16fa75b8b1be0fc637a4278e756fb54d15;hp=7e1d17ed00549331b338fcc91706af126a1a51aa;hb=85fd0dc91fd9b0a5eef07c24b3bb8ba43f8ba4a0;hpb=19aa6d657a4043b94d6b69925cd147afd5922e5a

diff --git a/.tx/merge-base b/.tx/merge-base
index 7e1d17ed0..10f5bb16f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jun 30 07:23:40 CEST 2020
+Fri Jul 31 07:23:47 CEST 2020