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

diff --git a/.tx/merge-base b/.tx/merge-base
index 76b17ee0d9..a49d20e678 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed May 13 07:23:38 CEST 2020
+Sat Jul 25 07:23:37 CEST 2020