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

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