X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=15b91cc93beaedd2dc0962e3c2d06f6a8b1b5c14;hb=e824d4612617171b932bba08f1a5a50500d4a603;hp=5424eefd5c099ee1b3947230861428927c571409;hpb=7d0a6b716586618d4910f9db36845503d1c4e33e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 5424eefd5..15b91cc93 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Nov 20 07:24:34 CET 2019
+Wed Apr  8 07:24:18 CEST 2020