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

diff --git a/.tx/merge-base b/.tx/merge-base
index 5737ecab2..4759f3290 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct  9 07:23:35 CEST 2020
+Sun Apr 18 07:24:45 CEST 2021