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

diff --git a/.tx/merge-base b/.tx/merge-base
index 76b17ee0d..4759f3290 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed May 13 07:23:38 CEST 2020
+Sun Apr 18 07:24:45 CEST 2021