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

diff --git a/.tx/merge-base b/.tx/merge-base
index 390d38fad8..0b85111398 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  3 07:23:37 CEST 2020
+Thu Jul 23 07:23:38 CEST 2020