X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=0c9aff00732e1425139fbbfff988896ec23b8fbd;hb=2969450a0a7d5b2c99e8b05cf448777e8d5aa21f;hp=ba395c5e356d0abe4fa60bef5df7306d87de0a0e;hpb=806cb4336719d7e1a4dbd28ca1e83689d8be3fc3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index ba395c5e3..0c9aff007 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jan  4 07:23:49 CET 2021
+Fri Jun 11 07:23:50 CEST 2021