X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=188907c41507edd6dce4c81d5a790c16d87d3371;hp=c214fcfbd9f735198c5524627c7ad5b401424ad8;hb=5be3a619774b8c54a1da7165aa519ab503087c35;hpb=82ed41e6271d6a1bcd7425d3b8eb42f024ab2b19

diff --git a/.tx/merge-base b/.tx/merge-base
index c214fcfbd..188907c41 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Jul  2 07:23:39 CEST 2020
+Tue Aug  4 07:23:45 CEST 2020