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

diff --git a/.tx/merge-base b/.tx/merge-base
index 18df019e6..4759f3290 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Mar 31 07:23:48 CEST 2021
+Sun Apr 18 07:24:45 CEST 2021