X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=c78952d2d56e78af34fc655251b2c1e279ce2c17;hp=ee9669e0cb7cd16d24d6786c6c92712d5f4d87a4;hb=54a53047f1e0046a25cdaea821d43700b1096a72;hpb=55597d95ed669d850d165beb1b298f555ab3fe57

diff --git a/.tx/merge-base b/.tx/merge-base
index ee9669e0c..c78952d2d 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jul  5 07:24:57 CEST 2020
+Wed Jul 15 07:25:42 CEST 2020