X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=4759f3290203adadb5deea1743f273e66a5f2001;hb=0656dcf67854525e7f6557680d368d461c8e4803;hp=d3611b7852442d2ed64cc78e0c3f37ed37e0e27d;hpb=93b9dda2870b95a16f4997086aec48677294103e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index d3611b785..4759f3290 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Nov 19 07:23:51 CET 2020
+Sun Apr 18 07:24:45 CEST 2021