X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=0b85111398535d306abbe0cb2226bc2bca51144d;hp=803036b6a9ca294200d18ad67bfe918459f45c82;hb=e506e628ce07239d4e07ac51d3293b7af633de9a;hpb=32e640c7f14f73ca5555fc95b725b5cdc99bb348

diff --git a/.tx/merge-base b/.tx/merge-base
index 803036b6a9..0b85111398 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Mar  6 07:24:27 CET 2020
+Thu Jul 23 07:23:38 CEST 2020