X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=10f5bb16fa75b8b1be0fc637a4278e756fb54d15;hp=9f1b31ded5a35a0ec72bc7b8196e0f755af698e3;hb=85fd0dc91fd9b0a5eef07c24b3bb8ba43f8ba4a0;hpb=76c39b503985ddf85c6df4bc674eb25566316069

diff --git a/.tx/merge-base b/.tx/merge-base
index 9f1b31ded..10f5bb16f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Jul 30 07:23:50 CEST 2020
+Fri Jul 31 07:23:47 CEST 2020