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

diff --git a/.tx/merge-base b/.tx/merge-base
index 76b17ee0d..7e1d17ed0 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed May 13 07:23:38 CEST 2020
+Tue Jun 30 07:23:40 CEST 2020