X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=a385ce7f9261a8027df95fddbc91b85f1aa26844;hp=366518820ffdfe5ff5f5799c6798a46637446315;hb=c439b1323366bc4860229bcd3df88f7a91a7086a;hpb=be996f9b9d67ebbb153442b7e077253de6da798c

diff --git a/.tx/merge-base b/.tx/merge-base
index 366518820..a385ce7f9 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jul  8 07:23:47 CEST 2020
+Wed Jul 22 07:23:44 CEST 2020