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

diff --git a/.tx/merge-base b/.tx/merge-base
index a08844559..fad0ce25a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Nov 23 07:23:44 CET 2020
+Mon Mar 15 07:23:52 CET 2021