X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=fad0ce25a6994c5ec7d6c716a53684a2c1b058af;hb=5d7aebf30f5605ecef1bfa299e448eb07fba3ea8;hp=4318e20fc91694b8c35c3f9af2adc9230c413596;hpb=17951117be81a0556605c0411f6d19cd16040204;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 4318e20fc..fad0ce25a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jan 31 07:24:57 CET 2021
+Mon Mar 15 07:23:52 CET 2021