X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=bb3feb0b51d329d70646323c2d4d53ce11690ee0;hp=42ea6ccdca27a01ccd61f46e5a32691c4351af7f;hb=700e216d21c55f70a992e2b2a62fd5b0c75b6911;hpb=edc317efa7b44478e7bd5c2ba46eff432c603ea6

diff --git a/.tx/merge-base b/.tx/merge-base
index 42ea6ccdc..bb3feb0b5 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jun 20 07:23:43 CEST 2020
+Mon Jul 20 07:23:45 CEST 2020