X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=b4d361e0740c9820ace8ea1699cfc6d2afb37e72;hp=67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553;hb=28c84564a35999ada57c2e045fe4db869e450032;hpb=8e4957c252f8381e37f2a72e227797bf51e5cc2f

diff --git a/.tx/merge-base b/.tx/merge-base
index 67a023d4c..b4d361e07 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Sep 12 07:24:50 CEST 2019
+Thu Feb 20 07:24:21 CET 2020