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

diff --git a/.tx/merge-base b/.tx/merge-base
index cf72facd6..4759f3290 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Mar 14 07:25:08 CET 2021
+Sun Apr 18 07:24:45 CEST 2021