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

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