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

diff --git a/.tx/merge-base b/.tx/merge-base
index a49d20e67..188907c41 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jul 25 07:23:37 CEST 2020
+Tue Aug  4 07:23:45 CEST 2020